[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.652,1.653 thumbnail.cpp,1.10,1.11
Eugene Sandulenko
sev at users.sourceforge.net
Sat Nov 26 18:37:01 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20957/scumm
Modified Files:
scumm.cpp thumbnail.cpp
Log Message:
Patch #1341626: "New GP32 port"
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -d -r1.652 -r1.653
--- scumm.cpp 27 Nov 2005 01:32:29 -0000 1.652
+++ scumm.cpp 27 Nov 2005 02:35:57 -0000 1.653
@@ -74,7 +74,7 @@
extern bool isSmartphone(void);
#endif
-#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
namespace Graphics {
extern void initfonts();
}
@@ -1787,7 +1787,7 @@
if (_version >= 5)
_sound->setupSound();
-#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
Graphics::initfonts();
#endif
@@ -3117,8 +3117,6 @@
return 0;
}
- ScummGameSettings game = *g;
-
// Calculate MD5 of the games detection file, for savegames etc.
const char *name = g->name;
char detectName[256], tempName[256], gameMD5[32+1];
@@ -3126,6 +3124,8 @@
int substLastIndex = 0;
bool found = false;
+ ScummGameSettings game = *g;
+
for (int method = 0; method < 6 && !found; method++) {
switch (method) {
case 0:
Index: thumbnail.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/thumbnail.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- thumbnail.cpp 18 Oct 2005 01:30:21 -0000 1.10
+++ thumbnail.cpp 27 Nov 2005 02:35:57 -0000 1.11
@@ -109,7 +109,7 @@
ThumbnailHeader header;
header.type = MKID('THMB');
-#ifdef PALMOS_ARM
+#if defined(PALMOS_ARM) || defined(__GP32__)
// sizeof(header) is hardcoded here, because the compiler add padding to
// have a 4byte aligned struct and there is no easy way to pack it.
header.size = 14 + thumb.w*thumb.h*thumb.bytesPerPixel;
More information about the Scummvm-git-logs
mailing list