Hello community, here is the log from the commit of package scummvm checked in at Thu Oct 26 20:30:29 CEST 2006. -------- --- scummvm/scummvm.changes 2006-10-23 03:14:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/scummvm/scummvm.changes 2006-10-25 12:03:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 25 12:00:40 CEST 2006 - sndirsch@suse.de + +- updated to new 0.9.1 release + * fixes Kyra bug which made game uncompletable + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scummvm.spec ++++++ --- /var/tmp/diff_new_pack.gi0nqa/_old 2006-10-26 20:30:05.000000000 +0200 +++ /var/tmp/diff_new_pack.gi0nqa/_new 2006-10-26 20:30:05.000000000 +0200 @@ -17,7 +17,7 @@ Group: Amusements/Games/Other Autoreqprov: on Version: 0.9.1 -Release: 1 +Release: 5 Summary: Interpreter for LucasArts games Source: %name-%version.tar.bz2 Source1: %name-tools-0.9.0.tar.bz2 @@ -105,6 +105,9 @@ /usr/share/pixmaps/scummvm.xpm %changelog -n scummvm +* Wed Oct 25 2006 - sndirsch@suse.de +- updated to new 0.9.1 release + * fixes Kyra bug which made game uncompletable * Mon Oct 23 2006 - sndirsch@suse.de - updated to release 0.9.1 (2006-10-29) * New Ports: ++++++ scummvm-0.9.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/AUTHORS new/scummvm-0.9.1/AUTHORS --- old/scummvm-0.9.1/AUTHORS 2006-10-22 23:01:09.000000000 +0200 +++ new/scummvm-0.9.1/AUTHORS 2006-10-24 10:15:52.000000000 +0200 @@ -79,6 +79,9 @@ Dreamcast: Marcus Comstedt + GP2X: + John Willis + GP32: Won Star diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/doc/credits.tex new/scummvm-0.9.1/doc/credits.tex --- old/scummvm-0.9.1/doc/credits.tex 2006-10-22 23:18:11.000000000 +0200 +++ new/scummvm-0.9.1/doc/credits.tex 2006-10-24 10:15:52.000000000 +0200 @@ -126,6 +126,12 @@ Marcus Comstedt & \textit{}\\ \end{tabular} \end{list} +\item \textbf{ GP2X} +\begin{list}{}{\setlength{\leftmargin}{0.2cm}} +\item \begin{tabular}[h]{p{0.3\linewidth}p{0.6\linewidth}} + John Willis & \textit{}\\ + \end{tabular} +\end{list} \item \textbf{ GP32} \begin{list}{}{\setlength{\leftmargin}{0.2cm}} \item \begin{tabular}[h]{p{0.3\linewidth}p{0.6\linewidth}} Binary files old/scummvm-0.9.1/doc/readme.pdf and new/scummvm-0.9.1/doc/readme.pdf differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/kyra/animator.cpp new/scummvm-0.9.1/engines/kyra/animator.cpp --- old/scummvm-0.9.1/engines/kyra/animator.cpp 2006-10-22 22:58:58.000000000 +0200 +++ new/scummvm-0.9.1/engines/kyra/animator.cpp 2006-10-24 10:15:51.000000000 +0200 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-9-1/engin... $ - * $Id: animator.cpp 22707 2006-05-28 11:33:17Z lordhoto $ + * $Id: animator.cpp 24483 2006-10-24 00:46:36Z lordhoto $ * */ @@ -389,9 +389,8 @@ void ScreenAnimator::copyChangedObjectsForward(int refreshFlag) { debugC(9, kDebugLevelAnimator, "ScreenAnimator::copyChangedObjectsForward(%d)", refreshFlag); - AnimObject *curObject = _objectQueue; - while (curObject) { + for (AnimObject *curObject = _objectQueue; curObject; curObject = curObject->nextAnimObject) { if (curObject->active) { if (curObject->refreshFlag || refreshFlag) { int xpos = 0, ypos = 0, width = 0, height = 0; @@ -402,14 +401,22 @@ if (xpos < 1) { xpos = 1; - } else if (xpos + width > 39) { - width = width - (xpos + width - 39); + } else if (xpos > 39) { + continue; + } + + if (xpos + width > 39) { + width = 39 - xpos; } if (ypos < 8) { ypos = 8; - } else if (ypos + height > 135) { - height = height - (ypos + height - 136); + } else if (ypos > 136) { + continue; + } + + if (ypos + height > 136) { + height = 136 - ypos; } _screen->copyRegion(xpos << 3, ypos, xpos << 3, ypos, width << 3, height, 2, 0, Screen::CR_CLIPPED); @@ -417,8 +424,8 @@ _updateScreen = true; } } - curObject = curObject->nextAnimObject; } + if (_updateScreen) { _screen->updateScreen(); _updateScreen = false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/kyra/resource.cpp new/scummvm-0.9.1/engines/kyra/resource.cpp --- old/scummvm-0.9.1/engines/kyra/resource.cpp 2006-10-22 22:58:58.000000000 +0200 +++ new/scummvm-0.9.1/engines/kyra/resource.cpp 2006-10-24 10:15:51.000000000 +0200 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-9-1/engin... $ - * $Id: resource.cpp 24458 2006-10-22 19:53:56Z lordhoto $ + * $Id: resource.cpp 24483 2006-10-24 00:46:36Z lordhoto $ * */ @@ -66,9 +66,9 @@ };*/ static const char *kyra1CDFilelist[] = { - "ADL.PAK", "CHAPTER1.VRM", "COL.PAK", "DRAGON1.APK", "DRAGON2.APK", "FINALE.PAK", - "INTRO1.PAK", "INTRO2.PAK", "INTRO3.PAK", "INTRO4.PAK", "MISC.PAK", "SND.PAK", - "STARTUP.PAK", "XMI.PAK", 0 + "ADL.PAK", "CHAPTER1.VRM", "COL.PAK", "FINALE.PAK", "INTRO1.PAK", "INTRO2.PAK", + "INTRO3.PAK", "INTRO4.PAK", "MISC.PAK", "SND.PAK", "STARTUP.PAK", "XMI.PAK", + "CAVE.APK", "DRAGON1.APK", "DRAGON2.APK", "LAGOON.APK", 0 }; /*static const char *kyra2CDFilelist[] = { @@ -174,6 +174,11 @@ } void Resource::unloadPakFile(const Common::String &filename) { + // never unload these! + if (scumm_stricmp(filename.c_str(), "CAVE.APK") == 0 || + scumm_stricmp(filename.c_str(), "LAGOON.APK") == 0) + return; + Common::List<PakFileEntry>::iterator start = _pakfiles.begin(); for (;start != _pakfiles.end(); ++start) { if (scumm_stricmp(start->_filename.c_str(), filename.c_str()) == 0) { @@ -181,7 +186,6 @@ break; } } - return; } bool Resource::isInPakList(const Common::String &filename) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/kyra/screen.cpp new/scummvm-0.9.1/engines/kyra/screen.cpp --- old/scummvm-0.9.1/engines/kyra/screen.cpp 2006-10-22 22:58:58.000000000 +0200 +++ new/scummvm-0.9.1/engines/kyra/screen.cpp 2006-10-24 10:15:51.000000000 +0200 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-9-1/engin... $ - * $Id: screen.cpp 23906 2006-09-17 09:54:42Z lordhoto $ + * $Id: screen.cpp 24483 2006-10-24 00:46:36Z lordhoto $ * */ @@ -2275,15 +2275,19 @@ return; } - if (w == 0 || h == 0) + if (w == 0 || h == 0 || x >= SCREEN_W || y >= SCREEN_H || x + w < 0 || y + h < 0) return; - if (x < 0) + if (x < 0) { + w += x; x = 0; + } if (x + w >= 320) w = 320 - x; - if (y < 0) + if (y < 0) { + h += y; y = 0; + } if (y + h >= 200) h = 200 - y; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/scumm/plugin.cpp new/scummvm-0.9.1/engines/scumm/plugin.cpp --- old/scummvm-0.9.1/engines/scumm/plugin.cpp 2006-10-22 22:57:28.000000000 +0200 +++ new/scummvm-0.9.1/engines/scumm/plugin.cpp 2006-10-24 10:15:50.000000000 +0200 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-9-1/engin... $ - * $Id: plugin.cpp 24096 2006-10-03 12:16:17Z kirben $ + * $Id: plugin.cpp 24482 2006-10-24 00:45:38Z kirben $ * */ @@ -114,6 +114,7 @@ { "dog", "Putt-Putt and Pep's Dog on a Stick" }, { "farm", "Let's Explore the Farm with Buzzy" }, { "football", "Backyard Football" }, + { "football2002", "Backyard Football 2002" }, { "freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds" }, { "freddi2", "Freddi Fish 2: The Case of the Haunted Schoolhouse" }, { "freddi3", "Freddi Fish 3: The Case of the Stolen Conch Shell" }, @@ -360,6 +361,7 @@ // Uses smacker in external files, for testing only {"artdemo", 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_16BIT_COLOR, UNK}, {"readdemo", 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_16BIT_COLOR, UNK}, + {"football2002", 0, GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_16BIT_COLOR, UNK}, // The following are meant to be generic HE game variants and as such do @@ -538,9 +540,10 @@ { "football", "football", kGenHEPC, UNK_LANG, UNK, 0 }, { "football", "FootBall", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "football", "FootBall Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, - { "football", "FootBall2002", kGenHEPC, UNK_LANG, UNK, 0 }, { "football", "footdemo", kGenHEPC, UNK_LANG, UNK, 0 }, + { "football2002", "FootBall2002", kGenHEPC, UNK_LANG, UNK, 0 }, + { "freddi", "freddi", kGenHEPC, UNK_LANG, UNK, 0 }, { "freddi", "freddemo", kGenHEPC, UNK_LANG, UNK, 0 }, { "freddi", "Freddi Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/scumm/scumm-md5.h new/scummvm-0.9.1/engines/scumm/scumm-md5.h --- old/scummvm-0.9.1/engines/scumm/scumm-md5.h 2006-10-22 22:57:28.000000000 +0200 +++ new/scummvm-0.9.1/engines/scumm/scumm-md5.h 2006-10-24 10:15:50.000000000 +0200 @@ -1,5 +1,5 @@ /* - This file was generated by the md5table tool on Tue Oct 03 12:13:02 2006 + This file was generated by the md5table tool on Tue Oct 24 00:42:27 2006 DO NOT EDIT MANUALLY! */ @@ -352,6 +352,7 @@ { "9e5e0fb43bd22f4628719b7501adb717", "monkey", "No Adlib", "EGA", Common::FR_FRA, Common::kPlatformAtariST }, { "9fd66fb3b04703bd50da4356e4202558", "spyfox2", "", "", Common::EN_ANY, Common::kPlatformMacintosh }, { "a00554c31d623fdb9fcb0f924b89b42b", "loom", "EGA", "EGA Demo", Common::EN_ANY, Common::kPlatformPC }, + { "a095616d2d23ccf43b8e257711202cba", "football2002", "", "", Common::EN_ANY, Common::kPlatformWindows }, { "a095e33061606d231ff37dca4c64c8ac", "pajama", "HE 99", "", Common::DE_DEU, Common::kPlatformUnknown }, { "a0a7dea72003933b8b3f8b99b9f7ddeb", "loom", "No Adlib", "EGA", Common::EN_ANY, Common::kPlatformAtariST }, { "a194f15f51ee62badab74b9e7da97693", "baseball2001", "", "Demo", Common::EN_ANY, Common::kPlatformUnknown }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/gui/credits.h new/scummvm-0.9.1/gui/credits.h --- old/scummvm-0.9.1/gui/credits.h 2006-10-22 22:50:13.000000000 +0200 +++ new/scummvm-0.9.1/gui/credits.h 2006-10-24 10:15:49.000000000 +0200 @@ -81,6 +81,9 @@ "\\C\\c1""Dreamcast", "\\C\\c0""Marcus Comstedt", "\\C\\c0""", +"\\C\\c1""GP2X", +"\\C\\c0""John Willis", +"\\C\\c0""", "\\C\\c1""GP32", "\\C\\c0""Won Star", "\\C\\c0""", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/tools/credits.pl new/scummvm-0.9.1/tools/credits.pl --- old/scummvm-0.9.1/tools/credits.pl 2006-10-22 23:17:45.000000000 +0200 +++ new/scummvm-0.9.1/tools/credits.pl 2006-10-24 10:15:52.000000000 +0200 @@ -547,6 +547,10 @@ add_person("Marcus Comstedt", "", ""); end_section(); + begin_section("GP2X"); + add_person("John Willis", "DJWillis", ""); + end_section(); + begin_section("GP32"); add_person("Won Star", "wonst719", ""); end_section(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/tools/scumm-md5.txt new/scummvm-0.9.1/tools/scumm-md5.txt --- old/scummvm-0.9.1/tools/scumm-md5.txt 2006-10-22 23:17:45.000000000 +0200 +++ new/scummvm-0.9.1/tools/scumm-md5.txt 2006-10-24 10:15:52.000000000 +0200 @@ -335,6 +335,9 @@ 425205754fa749f4f0b0dd9d09fa45fd en All - Demo - Joachim Eberhard 5bd335265a61caa3d78956ad9f88ba23 en All - Demo - sev +football2002 Backyard Football 2002 + a095616d2d23ccf43b8e257711202cba en Windows - - - clone2727 + soccer Backyard Soccer 701246819d1a70573f41bf33fc19214f en All - - - sev ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de