thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move to HE80

Browse source 
svn-id: r17919
This commit is contained in:
Travis Howell 2005-05-05 13:16:50 +00:00
parent f5900a917c
commit 4dacf09f72
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scumm/intern.h
View file

@ -952,6 +952,7 @@ protected:
byte VAR_POLYGONS_ONLY; byte VAR_POLYGONS_ONLY;
byte VAR_PLATFORM; byte VAR_PLATFORM;
byte VAR_WINDOWS_VERSION; byte VAR_WINDOWS_VERSION;
byte VAR_CURRENT_CHARSET;
byte VAR_U32_VERSION; byte VAR_U32_VERSION;
byte VAR_WIZ_TCOLOR; byte VAR_WIZ_TCOLOR;
}; };
@ -978,6 +979,8 @@ protected:
virtual void initScummVars(); virtual void initScummVars();
virtual void initCharset(int charset);
virtual void clearDrawQueues(); virtual void clearDrawQueues();
void loadImgSpot(int resId, int state, int16 &x, int16 &y); void loadImgSpot(int resId, int state, int16 &x, int16 &y);

2
scumm/scumm.cpp
View file

@ -1054,7 +1054,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
VAR_MUSIC_BUNDLE_LOADED = 0xFF; VAR_MUSIC_BUNDLE_LOADED = 0xFF;
VAR_VOICE_BUNDLE_LOADED = 0xFF; VAR_VOICE_BUNDLE_LOADED = 0xFF;
VAR_CURRENT_CHARSET = 0xFF;
VAR_SKIP_RESET_TALK_ACTOR = 0xFF; VAR_SKIP_RESET_TALK_ACTOR = 0xFF;
VAR_MUSIC_CHANNEL = 0xFF; VAR_MUSIC_CHANNEL = 0xFF;
VAR_SOUND_CHANNEL = 0xFF; VAR_SOUND_CHANNEL = 0xFF;
@ -1299,6 +1298,7 @@ ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, cons
VAR_POLYGONS_ONLY = 0xFF; VAR_POLYGONS_ONLY = 0xFF;
VAR_PLATFORM = 0xFF; VAR_PLATFORM = 0xFF;
VAR_WINDOWS_VERSION = 0xFF; VAR_WINDOWS_VERSION = 0xFF;
VAR_CURRENT_CHARSET = 0xFF;
VAR_U32_VERSION = 0xFF; VAR_U32_VERSION = 0xFF;
VAR_WIZ_TCOLOR = 0xFF; VAR_WIZ_TCOLOR = 0xFF;
} }

3
scumm/scumm.h
View file

@ -1131,7 +1131,7 @@ protected:
bool _keepText; bool _keepText;
void initCharset(int charset); virtual void initCharset(int charset);
void printString(int m, const byte *msg); void printString(int m, const byte *msg);
@ -1296,7 +1296,6 @@ public:
byte VAR_CLICK_AREA; byte VAR_CLICK_AREA;
// HE specific variables // HE specific variables
byte VAR_CURRENT_CHARSET;
byte VAR_SKIP_RESET_TALK_ACTOR; byte VAR_SKIP_RESET_TALK_ACTOR;
byte VAR_MUSIC_CHANNEL; byte VAR_MUSIC_CHANNEL;
byte VAR_SOUND_CHANNEL; byte VAR_SOUND_CHANNEL;

8
scumm/string.cpp
View file

@ -741,6 +741,11 @@ int ScummEngine::addStringToStack(byte *dst, int dstSize, int var) {
return 0; return 0;
} }
void ScummEngine_v80he::initCharset(int charsetno) {
ScummEngine::initCharset(charsetno);
VAR(VAR_CURRENT_CHARSET) = charsetno;
}
void ScummEngine::initCharset(int charsetno) { void ScummEngine::initCharset(int charsetno) {
int i; int i;
@ -758,9 +763,6 @@ void ScummEngine::initCharset(int charsetno) {
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
_charsetColorMap[i] = _charsetData[charsetno][i]; _charsetColorMap[i] = _charsetData[charsetno][i];
if (_heversion >= 80) {
VAR(VAR_CURRENT_CHARSET) = charsetno;
}
} }
void ScummEngine_v6::enqueueText(const byte *text, int x, int y, byte color, byte charset, bool center) { void ScummEngine_v6::enqueueText(const byte *text, int x, int y, byte color, byte charset, bool center) {