[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.449,2.450 scumm.cpp,1.449,1.450 scumm.h,1.594,1.595 vars.cpp,1.125,1.126
Max Horn
fingolfin at users.sourceforge.net
Wed Apr 20 16:13:49 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.448,2.449 scumm.cpp,1.448,1.449 scumm.h,1.593,1.594 vars.cpp,1.124,1.125
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.125,1.126 dimuse.h,1.72,1.73 dimuse_music.cpp,1.36,1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20688
Modified Files:
intern.h scumm.cpp scumm.h vars.cpp
Log Message:
Moved some more VARs; added comments to some of the vars which explain where they are used
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.449
retrieving revision 2.450
diff -u -d -r2.449 -r2.450
--- intern.h 20 Apr 2005 20:34:24 -0000 2.449
+++ intern.h 20 Apr 2005 23:13:07 -0000 2.450
@@ -696,6 +696,7 @@
virtual void executeOpcode(byte i);
virtual const char *getOpcodeDesc(byte i);
+ virtual void setupScummVars();
virtual void initScummVars();
virtual void readRoomsOffsets();
@@ -732,6 +733,8 @@
void o70_setWindowCaption();
void o70_polygonOps();
void o70_polygonHit();
+
+ byte VAR_NUM_SOUND_CHANNELS;
};
class ScummEngine_v72he : public ScummEngine_v70he {
@@ -867,6 +870,8 @@
void o72_setFilePath();
void o72_setWindowCaption();
+ byte VAR_NUM_ACTIVE_SOUND_CHANNELS;
+
byte VAR_NUM_ROOMS;
byte VAR_NUM_SCRIPTS;
byte VAR_NUM_SOUNDS;
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -d -r1.449 -r1.450
--- scumm.cpp 20 Apr 2005 20:34:25 -0000 1.449
+++ scumm.cpp 20 Apr 2005 23:13:08 -0000 1.450
@@ -1038,8 +1038,6 @@
VAR_MUSIC_BUNDLE_LOADED = 0xFF;
VAR_VOICE_BUNDLE_LOADED = 0xFF;
- VAR_NUM_ACTIVE_SOUND_CHANNELS = 0xFF;
- VAR_NUM_SOUND_CHANNELS = 0xFF;
VAR_MUSIC_CHANNEL = 0xFF;
VAR_SOUND_CHANNEL = 0xFF;
@@ -1255,6 +1253,8 @@
_heSndFlags = 0;
_heSndSoundFreq = 0;
_heSBNGId = 0;
+
+ VAR_NUM_SOUND_CHANNELS = 0xFF;
}
ScummEngine_v70he::~ScummEngine_v70he() {
@@ -1265,6 +1265,8 @@
ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16])
: ScummEngine_v70he(detector, syst, gs, md5sum) {
+ VAR_NUM_ACTIVE_SOUND_CHANNELS = 0xFF;
+
VAR_NUM_ROOMS = 0xFF;
VAR_NUM_SCRIPTS = 0xFF;
VAR_NUM_SOUNDS = 0xFF;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -d -r1.594 -r1.595
--- scumm.h 20 Apr 2005 20:34:26 -0000 1.594
+++ scumm.h 20 Apr 2005 23:13:09 -0000 1.595
@@ -1218,7 +1218,7 @@
byte VAR_ME;
byte VAR_NUM_ACTOR;
byte VAR_CURRENT_LIGHTS;
- byte VAR_CURRENTDRIVE; // How about merging this with VAR_CURRENTDISK?
+ byte VAR_CURRENTDRIVE;
byte VAR_CURRENTDISK;
byte VAR_TMR_1;
byte VAR_TMR_2;
@@ -1268,6 +1268,7 @@
byte VAR_FADE_DELAY;
byte VAR_NOSUBTITLES;
+ // V5+
byte VAR_SOUNDPARAM;
byte VAR_SOUNDPARAM2;
byte VAR_SOUNDPARAM3;
@@ -1277,16 +1278,17 @@
byte VAR_ROOM_FLAG;
byte VAR_GAME_LOADED;
byte VAR_NEW_ROOM;
- byte VAR_VERSION_KEY;
+ // V4/V5
byte VAR_V5_TALK_STRING_Y;
+ // V6+
byte VAR_ROOM_WIDTH;
byte VAR_ROOM_HEIGHT;
byte VAR_V6_EMSSPACE;
+ // V7/V8 (=GF_NEW_CAMERA) specific variables
byte VAR_CAMERA_POS_Y;
-
byte VAR_CAMERA_MIN_Y;
byte VAR_CAMERA_MAX_Y;
byte VAR_CAMERA_THRESHOLD_X;
@@ -1295,28 +1297,35 @@
byte VAR_CAMERA_SPEED_Y;
byte VAR_CAMERA_ACCEL_X;
byte VAR_CAMERA_ACCEL_Y;
-
byte VAR_CAMERA_DEST_X;
-
byte VAR_CAMERA_DEST_Y;
-
byte VAR_CAMERA_FOLLOWED_ACTOR;
- byte VAR_LEFTBTN_DOWN;
- byte VAR_RIGHTBTN_DOWN;
- byte VAR_LEFTBTN_HOLD;
- byte VAR_RIGHTBTN_HOLD;
- byte VAR_MOUSE_BUTTONS;
- byte VAR_MOUSE_HOLD;
- byte VAR_SAVELOAD_SCRIPT;
- byte VAR_SAVELOAD_SCRIPT2;
-
+ // V7/V8 specific variables
+ byte VAR_VERSION_KEY;
byte VAR_DEFAULT_TALK_DELAY;
+ byte VAR_CUSTOMSCALETABLE;
+ byte VAR_BLAST_ABOVE_TEXT;
+ byte VAR_VOICE_MODE;
+ byte VAR_MUSIC_BUNDLE_LOADED;
+ byte VAR_VOICE_BUNDLE_LOADED;
+
+ byte VAR_LEFTBTN_DOWN; // V7
+ byte VAR_RIGHTBTN_DOWN; // V7
+ byte VAR_LEFTBTN_HOLD; // V6/V72HE/V7
+ byte VAR_RIGHTBTN_HOLD; // V6/V72HE/V7
+ byte VAR_MOUSE_BUTTONS; // V8
+ byte VAR_MOUSE_HOLD; // V8
+ byte VAR_SAVELOAD_SCRIPT; // V6/V7 (not HE)
+ byte VAR_SAVELOAD_SCRIPT2; // V6/V7 (not HE)
+
+ // V6/V7 specific variables (actually, they are only used in FT and Sam, it seems?)
byte VAR_CHARSET_MASK;
- byte VAR_CUSTOMSCALETABLE;
+ // V6 specific variables
byte VAR_V6_SOUNDMODE;
+ // V1/V2 specific variables
byte VAR_CHARCOUNT;
byte VAR_VERB_ALLOWED;
byte VAR_ACTIVE_VERB;
@@ -1324,23 +1333,18 @@
byte VAR_ACTIVE_OBJECT2;
byte VAR_CLICK_AREA;
- byte VAR_BLAST_ABOVE_TEXT;
- byte VAR_VOICE_MODE;
- byte VAR_MUSIC_BUNDLE_LOADED;
- byte VAR_VOICE_BUNDLE_LOADED;
-
- byte VAR_NUM_ACTIVE_SOUND_CHANNELS;
- byte VAR_NUM_SOUND_CHANNELS;
+ // HE specific variables
byte VAR_MUSIC_CHANNEL;
byte VAR_SOUND_CHANNEL;
byte VAR_SCRIPT_CYCLE;
byte VAR_NUM_SCRIPT_CYCLES;
- byte VAR_NUM_GLOBAL_OBJS; // Exists both in V7 and in V72HE
-
byte VAR_KEY_STATE; // Used in parseEvents()
byte VAR_MOUSE_STATE;
+
+ // Exists both in V7 and in V72HE:
+ byte VAR_NUM_GLOBAL_OBJS;
};
} // End of namespace Scumm
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- vars.cpp 20 Apr 2005 20:34:44 -0000 1.125
+++ vars.cpp 20 Apr 2005 23:13:11 -0000 1.126
@@ -170,11 +170,7 @@
VAR_V6_EMSSPACE = 76;
VAR_RANDOM_NR = 118;
- if (_heversion >= 70) {
- VAR_NUM_SOUND_CHANNELS = 9;
- VAR_SOUND_CHANNEL = 10;
- VAR_MUSIC_CHANNEL = 14;
- } else {
+ if (_heversion < 70) {
VAR_V6_SOUNDMODE = 9;
}
@@ -189,6 +185,14 @@
}
+void ScummEngine_v70he::setupScummVars() {
+ ScummEngine_v6::setupScummVars();
+
+ VAR_NUM_SOUND_CHANNELS = 9;
+ VAR_SOUND_CHANNEL = 10;
+ VAR_MUSIC_CHANNEL = 14;
+}
+
void ScummEngine_v72he::setupScummVars() {
// TODO Not complete
VAR_KEYPRESS = 0;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.448,2.449 scumm.cpp,1.448,1.449 scumm.h,1.593,1.594 vars.cpp,1.124,1.125
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.125,1.126 dimuse.h,1.72,1.73 dimuse_music.cpp,1.36,1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list