diff options
| author | Eugene Sandulenko | 2005-11-27 02:35:57 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-11-27 02:35:57 +0000 |
| commit | edfae828f6a792fe4809ca77a1181a00ed8b9f46 (patch) | |
| tree | 69669f918ebfcb846c9a699a81c1c74804e720d1 /scumm | |
| parent | e6aba1f7aa00721140809b7b55270c4e171f53e5 (diff) | |
| download | scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.tar.gz scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.tar.bz2 scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.zip | |
Patch #1341626: "New GP32 port"
svn-id: r19710
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.cpp | 8 | ||||
| -rw-r--r-- | scumm/thumbnail.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 755c523766..c48011dead 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -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 @@ int ScummEngine::init(GameDetector &detector) { 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 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { 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 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { int substLastIndex = 0; bool found = false; + ScummGameSettings game = *g; + for (int method = 0; method < 6 && !found; method++) { switch (method) { case 0: diff --git a/scumm/thumbnail.cpp b/scumm/thumbnail.cpp index 1a4e6a1e31..c3d6f33898 100644 --- a/scumm/thumbnail.cpp +++ b/scumm/thumbnail.cpp @@ -109,7 +109,7 @@ void ScummEngine::saveThumbnail(Common::OutSaveFile *file) { 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; |