[Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.92,1.93 display.h,1.53,1.54 graphics.h,1.75,1.76 musicdata.cpp,1.14,1.15 resource.cpp,1.61,1.62 resource.h,1.45,1.46 restables.cpp,1.8,1.9 sound.cpp,1.60,1.61 sound.h,1.33,1.34 talk.cpp,1.119,1.120 talk.h,1.38,1.39
Chris Apers
chrilith at users.sourceforge.net
Sat Nov 5 10:12:58 CET 2005
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14414
Modified Files:
display.cpp display.h graphics.h musicdata.cpp resource.cpp
resource.h restables.cpp sound.cpp sound.h talk.cpp talk.h
Log Message:
Changed PalmOS ifdef
Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- display.cpp 5 Nov 2005 09:58:27 -0000 1.92
+++ display.cpp 5 Nov 2005 18:12:41 -0000 1.93
@@ -28,14 +28,14 @@
#include "queen/queen.h"
#include "queen/resource.h"
-#if defined(__PALM_OS__)
+#if defined(PALMOS_68K)
#include "arm/native.h"
#include "arm/macros.h"
#endif
namespace Queen {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
static const uint8 *_fontRegular;
static const uint8 *_fontHebrew;
static const uint8 *_palJoeClothes;
@@ -569,7 +569,7 @@
uint8 *dst = _screenBuf;
const uint8 *src = _backdropBuf + _horizontalScroll;
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
ARM_START(CopyRectangleType)
ARM_INIT(COMMON_COPYRECT)
ARM_ADDM(dst)
@@ -696,7 +696,7 @@
assert(w <= dstPitch);
dstBuf += dstPitch * y + x;
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
ARM_CHECK_EXEC(w > 8 && h > 8)
ARM_START(BlitType)
ARM_INIT(QUEEN_BLIT)
@@ -1044,7 +1044,7 @@
}
}
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
const uint8 Display::_fontRegular[] = {
0xF8, 0xB0, 0xB0, 0x80, 0xB0, 0xB0, 0xC0, 0x00, 0xF8, 0xB0, 0xB0, 0x80, 0xB0, 0xB0, 0xC0, 0x00,
0xF8, 0xB0, 0xB0, 0x80, 0xB0, 0xB0, 0xC0, 0x00, 0xF8, 0xB0, 0xB0, 0x80, 0xB0, 0xB0, 0xC0, 0x00,
@@ -1323,7 +1323,7 @@
} // End of namespace Queen
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Queen_Display)
Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- display.h 18 Oct 2005 01:30:18 -0000 1.53
+++ display.h 5 Nov 2005 18:12:41 -0000 1.54
@@ -234,7 +234,7 @@
QueenEngine *_vm;
const uint8 *_font;
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
static const uint8 _fontRegular[];
static const uint8 _fontHebrew[];
static const uint8 _palJoeClothes[];
Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- graphics.h 18 Oct 2005 01:30:18 -0000 1.75
+++ graphics.h 5 Nov 2005 18:12:41 -0000 1.76
@@ -257,7 +257,7 @@
int16 frame;
};
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
public:
#endif
struct BamDataBlock {
@@ -266,7 +266,7 @@
BamDataObj fx;
int16 sfx;
};
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
private:
#endif
@@ -279,7 +279,7 @@
QueenEngine *_vm;
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
static const BamDataBlock _carData[];
static const BamDataBlock _fight1Data[];
static const BamDataBlock _fight2Data[];
Index: musicdata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/musicdata.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- musicdata.cpp 18 Oct 2005 01:30:19 -0000 1.14
+++ musicdata.cpp 5 Nov 2005 18:12:41 -0000 1.15
@@ -24,7 +24,7 @@
namespace Queen {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
const songData *Sound::_songDemo;
const songData *Sound::_song;
@@ -1919,7 +1919,7 @@
} // End of namespace Queen
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Queen_Musicdata)
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- resource.cpp 18 Oct 2005 01:30:19 -0000 1.61
+++ resource.cpp 5 Nov 2005 18:12:41 -0000 1.62
@@ -24,7 +24,7 @@
namespace Queen {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
static ResourceEntry *_resourceTablePEM10;
#endif
@@ -81,7 +81,7 @@
while (*ptr++);
ResourceEntry *re = NULL;
-#ifndef __PALM_OS__
+#ifndef PALMOS_MODE
re = (ResourceEntry *)bsearch(entryName, _resourceTable, _resourceEntries, sizeof(ResourceEntry), compareResourceEntry);
#else
// PALMOS FIXME (?) : still doesn't work for me (????) use this instead
@@ -269,7 +269,7 @@
} // End of namespace Queen
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Queen_Restables)
Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- resource.h 18 Oct 2005 01:30:19 -0000 1.45
+++ resource.h 5 Nov 2005 18:12:41 -0000 1.46
@@ -157,7 +157,7 @@
//! known FOTAQ versions
static const GameVersion _gameVersions[];
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
//! resource table for english floppy version
static ResourceEntry _resourceTablePEM10[];
#endif
Index: restables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/restables.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- restables.cpp 18 Oct 2005 01:30:19 -0000 1.8
+++ restables.cpp 5 Nov 2005 18:12:41 -0000 1.9
@@ -23,7 +23,7 @@
namespace Queen {
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
//English Floppy Version
ResourceEntry Resource::_resourceTablePEM10[] = {
{ "1000SSSS.SB", 1, 0x00000000, 0x000027fe },
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sound.cpp 18 Oct 2005 01:30:19 -0000 1.60
+++ sound.cpp 5 Nov 2005 18:12:41 -0000 1.61
@@ -96,7 +96,7 @@
if (sfx != 0) {
char name[13];
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
strcpy(name, _sfxName[sfx - 1]);
#else
strncpy(name, _sfxName + 10 * (sfx - 1), 10); // saved as 8char + /0/0
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- sound.h 18 Oct 2005 01:30:19 -0000 1.33
+++ sound.h 5 Nov 2005 18:12:41 -0000 1.34
@@ -84,7 +84,7 @@
void saveState(byte *&ptr);
void loadState(uint32 ver, byte *&ptr);
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
static const songData _songDemo[];
static const songData _song[];
static const tuneData _tuneDemo[];
Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- talk.cpp 18 Oct 2005 01:30:19 -0000 1.119
+++ talk.cpp 5 Nov 2005 18:12:41 -0000 1.120
@@ -38,7 +38,7 @@
namespace Queen {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
static const Talk::SpeechParameters *_speechParameters;
#endif
@@ -1332,7 +1332,7 @@
return selectedSentence;
}
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
const Talk::SpeechParameters Talk::_speechParameters[] = {
{ "JOE", 0, 1, 1, 10, 2, 3, "", 0 },
{ "JOE", 0, 3, 3, 28, 2, 3, "", 0 },
@@ -1797,7 +1797,7 @@
} // End of namespace Queen
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Queen_Talk)
Index: talk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- talk.h 18 Oct 2005 01:30:19 -0000 1.38
+++ talk.h 5 Nov 2005 18:12:41 -0000 1.39
@@ -77,7 +77,7 @@
int16 gameStateValue;
};
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
struct SpeechParameters {
const char *name;
signed char state,faceDirection;
@@ -150,7 +150,7 @@
char _talkString[5][MAX_STRING_SIZE];
char _joeVoiceFilePrefix[5][MAX_STRING_SIZE];
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
static const SpeechParameters _speechParameters[];
#endif
More information about the Scummvm-git-logs
mailing list