[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.64,1.65 simon.h,1.62,1.63

Travis Howell kirben at users.sourceforge.net
Tue May 20 09:25:09 CEST 2003


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv14122/simon

Modified Files:
	items.cpp simon.h 
Log Message:

Switch to ints


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- items.cpp	20 May 2003 15:37:02 -0000	1.64
+++ items.cpp	20 May 2003 16:24:31 -0000	1.65
@@ -1432,8 +1432,8 @@
 }
 
 void SimonState::o_unk_127() {
-	uint a = getVarOrWord();
-	uint b = getVarOrWord();
+	int a = getVarOrWord();
+	int b = getVarOrWord();
 	if (_game & GF_SIMON2) {
 		uint c = getVarOrByte();
 

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- simon.h	20 May 2003 15:37:03 -0000	1.62
+++ simon.h	20 May 2003 16:24:31 -0000	1.63
@@ -198,8 +198,8 @@
 	int _x_scroll, _vga_var1, _vga_var2, _vga_var3, _vga_var5;
 	byte _vga_var8;
 
-	uint16 _vc72_var1, _vc72_var2, _vc72_var3;
-	uint16 _vc70_var1, _vc70_var2;
+	int16 _vc72_var1, _vc72_var2, _vc72_var3;
+	int16 _vc70_var1, _vc70_var2;
 	byte *_vga_var7;
 
 	int16 _script_cond_a, _script_cond_b, _script_cond_c;
@@ -257,8 +257,8 @@
 	byte _video_var_9;
 
 	uint _midi_sfx;
-	uint16 _last_music_played;
-	uint16 _next_music_to_play;
+	int16 _last_music_played;
+	int16 _next_music_to_play;
 
 	bool _show_preposition;
 	bool _showmessage_flag;





More information about the Scummvm-git-logs mailing list