[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.246,1.247 actor.h,1.53,1.54 base-costume.cpp,2.12,2.13 base-costume.h,1.20,1.21 script_v6.cpp,1.347,1.348 script_v6he.cpp,2.72,2.73

Travis Howell kirben at users.sourceforge.net
Tue Jun 29 04:03:17 CEST 2004


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

Modified Files:
	actor.cpp actor.h base-costume.cpp base-costume.h 
	script_v6.cpp script_v6he.cpp 
Log Message:

Rename var


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- actor.cpp	29 Jun 2004 05:36:01 -0000	1.246
+++ actor.cpp	29 Jun 2004 11:02:14 -0000	1.247
@@ -57,7 +57,7 @@
 	walkbox = 0;
 	animProgress = 0;
 	skipLimb = false;
-	actor_draw_to_bg = false;
+	actorDrawVirScr = false;
 	memset(animVariable, 0, sizeof(animVariable));
 	memset(palette, 0, sizeof(palette));
 	memset(sound, 0, sizeof(sound));
@@ -1018,7 +1018,7 @@
 
 	bcr->_draw_bottom = bottom = 0;
 	bcr->_skipLimb = (skipLimb != 0);
-	bcr->_actor_draw_to_bg = (actor_draw_to_bg != 0);
+	bcr->_actorDrawVirScr = (actorDrawVirScr != 0);
 
 	// If the actor is partially hidden, redraw it next frame.
 	// Only done for pre-AKOS, though.

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- actor.h	29 Jun 2004 05:36:01 -0000	1.53
+++ actor.h	29 Jun 2004 11:02:15 -0000	1.54
@@ -108,7 +108,7 @@
 	uint16 talkScript, walkScript;
 	bool ignoreTurns;
 	bool skipLimb;
-	bool actor_draw_to_bg;
+	bool actorDrawVirScr;
 	int8 layer;
 	uint16 sound[8];
 	CostumeData cost;

Index: base-costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.cpp,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- base-costume.cpp	29 Jun 2004 05:36:01 -0000	2.12
+++ base-costume.cpp	29 Jun 2004 11:02:15 -0000	2.13
@@ -29,7 +29,7 @@
 	int i;
 	byte result = 0;
 
-	if (_actor_draw_to_bg)
+	if (_actorDrawVirScr)
 		_outptr = _vm->getResourceAddress(rtBuffer, 5) + vs.xstart;
 	else
 		_outptr = vs.screenPtr + vs.xstart;

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- base-costume.h	29 Jun 2004 05:36:01 -0000	1.20
+++ base-costume.h	29 Jun 2004 11:02:15 -0000	1.21
@@ -62,7 +62,7 @@
 
 	int _draw_top, _draw_bottom;
 	bool _skipLimb;
-	bool _actor_draw_to_bg;
+	bool _actorDrawVirScr;
 
 
 protected:
@@ -117,7 +117,7 @@
 		_mirror = false;
 		_width = _height = 0;
 		_skipLimb = 0;
-		_actor_draw_to_bg = 0;
+		_actorDrawVirScr = 0;
 
 		
 		_outptr = 0;

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -d -r1.347 -r1.348
--- script_v6.cpp	29 Jun 2004 10:21:53 -0000	1.347
+++ script_v6.cpp	29 Jun 2004 11:02:15 -0000	1.348
@@ -2921,9 +2921,9 @@
 		a->scalex = state;
 		a->scaley = state;
 		a->putActor(x, y, _currentRoom);
-		a->actor_draw_to_bg = true;
+		a->actorDrawVirScr = true;
 		a->drawActorCostume();
-		a->actor_draw_to_bg = false;
+		a->actorDrawVirScr = false;
 		a->drawActorCostume();
 		return;
 	}

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.72
retrieving revision 2.73
diff -u -d -r2.72 -r2.73
--- script_v6he.cpp	29 Jun 2004 05:36:01 -0000	2.72
+++ script_v6he.cpp	29 Jun 2004 11:02:15 -0000	2.73
@@ -677,10 +677,10 @@
 		{
 			int top_actor = a->top;
 			int bottom_actor = a->bottom;
-			a->actor_draw_to_bg = true;
+			a->actorDrawVirScr = true;
 			a->needRedraw = true;
 			a->drawActorCostume();
-			a->actor_draw_to_bg = false;
+			a->actorDrawVirScr = false;
 			a->needRedraw = true;
 			a->drawActorCostume();
 			a->needRedraw = false;
@@ -693,7 +693,7 @@
 		}
 		break;
 	case 219:
-		a->actor_draw_to_bg = false;
+		a->actorDrawVirScr = false;
 		a->needRedraw = true;
 		a->needBgReset = true;
 		break;





More information about the Scummvm-git-logs mailing list