[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.685,1.686 scumm.h,1.662,1.663 vars.cpp,1.158,1.159

kirben kirben at users.sourceforge.net
Fri Jan 13 21:33:03 CET 2006


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19413/scumm

Modified Files:
	scumm.cpp scumm.h vars.cpp 
Log Message:

HE99+ games may run an additional script during main loop.
Fixes the missing magnifying glass in puttcircus.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -d -r1.685 -r1.686
--- scumm.cpp	14 Jan 2006 05:06:01 -0000	1.685
+++ scumm.cpp	14 Jan 2006 05:32:11 -0000	1.686
@@ -1360,6 +1360,7 @@
 	VAR_SOUNDCODE_TMR = 0xFF;
 	VAR_DEFAULT_SOUND_CHANNEL = 0xFF;
 
+	VAR_MAIN_SCRIPT = 0xFF;
 	VAR_NUM_SCRIPT_CYCLES = 0xFF;
 	VAR_SCRIPT_CYCLE = 0xFF;
 
@@ -2577,6 +2578,10 @@
 			clearClickedStatus();
 		}
 
+		if (VAR_MAIN_SCRIPT != 0xFF && VAR(VAR_MAIN_SCRIPT) != 0) {
+			runScript(VAR(VAR_MAIN_SCRIPT), 0, 0, 0);
+		}
+
 		// Handle mouse over effects (for verbs).
 		handleMouseOver(oldEgo != VAR(VAR_EGO));
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -d -r1.662 -r1.663
--- scumm.h	10 Jan 2006 21:39:14 -0000	1.662
+++ scumm.h	14 Jan 2006 05:32:11 -0000	1.663
@@ -1336,6 +1336,7 @@
 	byte VAR_SOUNDCODE_TMR;
 	byte VAR_DEFAULT_SOUND_CHANNEL;
 
+	byte VAR_MAIN_SCRIPT;
 	byte VAR_SCRIPT_CYCLE;
 	byte VAR_NUM_SCRIPT_CYCLES;
 

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- vars.cpp	9 Jan 2006 11:01:35 -0000	1.158
+++ vars.cpp	14 Jan 2006 05:32:11 -0000	1.159
@@ -317,6 +317,7 @@
 		VAR_SKIP_RESET_TALK_ACTOR = 125;
 	}
 	if (_heversion >= 99) {
+		VAR_MAIN_SCRIPT = 127;
 		VAR_NUM_PALETTES = 130;
 		VAR_NUM_UNK = 131;
 	}





More information about the Scummvm-git-logs mailing list