[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.117,1.118 actor.h,1.29,1.30 script_v6.cpp,1.139,1.140 script_v8.cpp,2.171,2.172

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5106

Modified Files:
	actor.cpp actor.h script_v6.cpp script_v8.cpp 
Log Message:
renamed walk_script/talk_script -> walkScript/talkScript

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- actor.cpp	30 May 2003 00:55:17 -0000	1.117
+++ actor.cpp	31 May 2003 14:27:47 -0000	1.118
@@ -93,14 +93,14 @@
 		talkStopFrame = 5;
 	}
 
-	walk_script = 0;
-	talk_script = 0;
+	walkScript = 0;
+	talkScript = 0;
 
 	_vm->_classData[number] = (_vm->_features & GF_AFTER_V7) ? _vm->_classData[0] : 0;
 }
 
 void Actor::stopActorMoving() {
-	_vm->stopScript(walk_script);
+	_vm->stopScript(walkScript);
 	moving = 0;
 }
 
@@ -1205,12 +1205,12 @@
 	 * work as usual
 	 */
 #if 1
-	if (walk_script != 0) {
+	if (walkScript != 0) {
 		int args[16];
 		args[0] = number;
 		args[1] = cmd;
 		args[2] = angle;
-		_vm->runScript(walk_script, 1, 0, args);
+		_vm->runScript(walkScript, 1, 0, args);
 	} else
 #endif
 	{
@@ -1564,8 +1564,8 @@
 	
 		MKLINE(Actor, layer, sleByte, VER_V8),
 	
-		MKLINE(Actor, talk_script, sleUint16, VER_V8),
-		MKLINE(Actor, walk_script, sleUint16, VER_V8),
+		MKLINE(Actor, talkScript, sleUint16, VER_V8),
+		MKLINE(Actor, walkScript, sleUint16, VER_V8),
 	
 		MKLINE(Actor, walkdata.destx, sleInt16, VER_V8),
 		MKLINE(Actor, walkdata.desty, sleInt16, VER_V8),

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- actor.h	30 May 2003 00:55:18 -0000	1.29
+++ actor.h	31 May 2003 14:27:47 -0000	1.30
@@ -101,7 +101,7 @@
 	byte walkbox;
 	byte animProgress, animSpeed;
 	int16 talkPosX, talkPosY;
-	uint16 talk_script, walk_script;
+	uint16 talkScript, walkScript;
 	bool ignoreTurns;	// TODO - we do not honor this flag at all currently!
 	int8 layer;
 	uint16 sound[8];
@@ -131,7 +131,7 @@
 		memset(animVariable, 0, sizeof(animVariable));
 		memset(palette, 0, sizeof(palette));
 
-		walk_script = 0;
+		walkScript = 0;
 
 		initActor(1);
 	}

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- script_v6.cpp	30 May 2003 00:55:18 -0000	1.139
+++ script_v6.cpp	31 May 2003 14:27:47 -0000	1.140
@@ -1740,7 +1740,7 @@
 		a->layer = pop();
 		break;
 	case 228:										/* walk script */
-		a->walk_script = pop();
+		a->walkScript = pop();
 		break;
 	case 229:										/* stand */
 		a->stopActorMoving();
@@ -1759,8 +1759,8 @@
 	case 234:										/* unfreeze actor */
 		a->moving &= ~MF_FROZEN;
 		break;
-	case 235:										/* talk_script */
-		a->talk_script = pop();
+	case 235:										/* talkScript */
+		a->talkScript = pop();
 		break;
 	default:
 		error("o6_actorOps: default case %d", b);

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.171
retrieving revision 2.172
diff -u -d -r2.171 -r2.172
--- script_v8.cpp	30 May 2003 00:55:20 -0000	2.171
+++ script_v8.cpp	31 May 2003 14:27:47 -0000	2.172
@@ -1151,10 +1151,10 @@
 		a->turnToDirection(pop());
 		break;
 	case 0x83:		// SO_ACTOR_WALK_SCRIPT Set walk script for actor?
-		a->walk_script = pop();
+		a->walkScript = pop();
 		break;
 	case 0x84:		// SO_ACTOR_TALK_SCRIPT Set talk script for actor?
-		a->talk_script = pop();
+		a->talkScript = pop();
 		break;
 	case 0x85:		// SO_ACTOR_WALK_PAUSE
 		a->moving |= MF_FROZEN;