[Scummvm-cvs-logs] SF.net SVN: scummvm: [30271] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 30271
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30271&view=rev
Author:   fingolfin
Date:     2008-01-05 15:05:16 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
VAR_TMR_4 has a special role from VAR_TMR_1 till 3 (in particular, it exists across far more SCUMM versions), so rename it to VAR_TIMER_TOTAL

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/scumm.h
    scummvm/trunk/engines/scumm/vars.cpp

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2008-01-05 23:02:35 UTC (rev 30270)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2008-01-05 23:05:16 UTC (rev 30271)
@@ -361,7 +361,7 @@
 	VAR_MOUSE_X = 0xFF;
 	VAR_MOUSE_Y = 0xFF;
 	VAR_TIMER = 0xFF;
-	VAR_TMR_4 = 0xFF;
+	VAR_TIMER_TOTAL = 0xFF;
 	VAR_SOUNDCARD = 0xFF;
 	VAR_VIDEOMODE = 0xFF;
 	VAR_MAINMENU_KEY = 0xFF;
@@ -1777,8 +1777,8 @@
 			VAR(41) += delta;
 		}
 	}
-	if (VAR_TMR_4 != 0xFF)
-		VAR(VAR_TMR_4) += delta;
+	if (VAR_TIMER_TOTAL != 0xFF)
+		VAR(VAR_TIMER_TOTAL) += delta;
 
 	if (delta > 15)
 		delta = 15;

Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h	2008-01-05 23:02:35 UTC (rev 30270)
+++ scummvm/trunk/engines/scumm/scumm.h	2008-01-05 23:05:16 UTC (rev 30271)
@@ -1255,7 +1255,7 @@
 	byte VAR_MOUSE_X;
 	byte VAR_MOUSE_Y;
 	byte VAR_TIMER;
-	byte VAR_TMR_4;
+	byte VAR_TIMER_TOTAL;
 	byte VAR_SOUNDCARD;
 	byte VAR_VIDEOMODE;
 	byte VAR_MAINMENU_KEY;

Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp	2008-01-05 23:02:35 UTC (rev 30270)
+++ scummvm/trunk/engines/scumm/vars.cpp	2008-01-05 23:05:16 UTC (rev 30271)
@@ -77,7 +77,7 @@
 	VAR_MOUSE_X = 44;
 	VAR_MOUSE_Y = 45;
 	VAR_TIMER = 46;
-	VAR_TMR_4 = 47;
+	VAR_TIMER_TOTAL = 47;
 	VAR_SOUNDCARD = 48;
 	VAR_VIDEOMODE = 49;
 
@@ -349,7 +349,7 @@
 	VAR_TALK_ACTOR = 12;
 	VAR_HAVE_MSG = 13;
 	VAR_TIMER = 14;
-	VAR_TMR_4 = 15;
+	VAR_TIMER_TOTAL = 15;
 
 	VAR_TIMEDATE_YEAR = 16;
 	VAR_TIMEDATE_MONTH = 17;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.