[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.31,1.32 akos.cpp,1.30,1.31 akos.h,1.8,1.9 gfx.cpp,1.96,1.97

[Max Horn]

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

Modified Files:
	script.cpp akos.cpp akos.h gfx.cpp 
Log Message:
cleanup

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- script.cpp	27 Dec 2002 01:49:47 -0000	1.31
+++ script.cpp	27 Dec 2002 14:04:25 -0000	1.32
@@ -488,7 +488,7 @@
 int Scumm::pop()
 {
 	if ((_scummStackPos < 1) || ((unsigned int)_scummStackPos > ARRAYSIZE(_scummStack))) {
-		error("No items on stack to pop() for %s (0x%X) at [%d-%d]\n", getOpcodeDesc(_opcode), _opcode, _roomResource, vm.slot[_currentScript].number);
+		error("No items on stack to pop() for %s (0x%X) at [%d-%d]", getOpcodeDesc(_opcode), _opcode, _roomResource, vm.slot[_currentScript].number);
 	}
 
 	return _scummStack[--_scummStackPos];

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- akos.cpp	16 Dec 2002 21:21:55 -0000	1.30
+++ akos.cpp	27 Dec 2002 14:04:25 -0000	1.31
@@ -595,11 +595,11 @@
 	/* implement custom scale table */
 
 
+	v1.scaletable = default_scale_table;
 
+	// FIXME - which value for VAR_CUSTOMSCALETABLE in V8 ?
 	if (_vm->isGlobInMemory(rtString, _vm->_vars[_vm->VAR_CUSTOMSCALETABLE])) {
 		v1.scaletable = _vm->getStringAddressVar(_vm->VAR_CUSTOMSCALETABLE);
-	} else {
-		v1.scaletable = default_scale_table;
 	}
 
 	/* Setup color decoding variables */
@@ -1239,10 +1239,10 @@
 	if (!mirror) {
 		dir = -1;
 
-    int tmp_skip_x = skip_x;
-    skip_x = _width-1-cur_x;
-    cur_x = _width-1-tmp_skip_x;
-    width_unk = clip_right;
+		int tmp_skip_x = skip_x;
+		skip_x = _width - 1 - cur_x;
+		cur_x = _width - 1 - tmp_skip_x;
+		width_unk = clip_right;
 /*
 		tmp1 = width - 1;
 		tmp2 = cur_x;
@@ -1252,7 +1252,8 @@
 		tmp1 -= cur_x;
 		width_unk = clip_right;
 		skip_x = tmp3;
-		cur_x = tmp1;*/
+		cur_x = tmp1;
+*/
 	}	else {
 		dir = 1;
 		width_unk = clip_left;
@@ -1415,8 +1416,7 @@
 
 		switch (code) {
 		case AKC_StartAnimInActor:
-			akos_queCommand(4, derefActorSafe(a->getAnimVar(GB(2)),
-																				"akos_increaseAnim:29"), a->getAnimVar(GB(3)), 0);
+			akos_queCommand(4, derefActorSafe(a->getAnimVar(GB(2)), "akos_increaseAnim:29"), a->getAnimVar(GB(3)), 0);
 			continue;
 
 		case AKC_Random:
@@ -1460,8 +1460,7 @@
 			akos_queCommand(4, a, a->getAnimVar(GB(2)), 0);
 			continue;
 		case AKC_SetVarInActor:
-			derefActorSafe(a->getAnimVar(GB(2)), "akos_increaseAnim:9")->setAnimVar(GB(3), GW(4)
-				);
+			derefActorSafe(a->getAnimVar(GB(2)), "akos_increaseAnim:9")->setAnimVar(GB(3), GW(4));
 			continue;
 		case AKC_HideActor:
 			akos_queCommand(1, a, 0, 0);

Index: akos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- akos.h	24 Oct 2002 06:28:54 -0000	1.8
+++ akos.h	27 Dec 2002 14:04:25 -0000	1.9
@@ -29,11 +29,11 @@
 struct CostumeData;
 
 struct AkosHeader {
-	byte x_1[2];
+	byte unk_1[2];
 	byte flags;
-	byte x_2;
+	byte unk_2;
 	uint16 num_anims;
-	uint16 x_3;
+	uint16 unk_3;
 	uint16 codec;
 } GCC_PACK;
 

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- gfx.cpp	26 Dec 2002 18:10:14 -0000	1.96
+++ gfx.cpp	27 Dec 2002 14:04:25 -0000	1.97
@@ -2680,9 +2680,9 @@
 	curpal = _currentPalette + startColor * 3;
 	for (i = startColor; i <= endColor; i++) {
 		*table++ = remapPaletteColor((curpal[0] * redScale) >> 8,
-									  curpal[1] * greenScale >> 8,
-									  curpal[2] * blueScale >> 8,
-									  (uint) - 1);
+									 (curpal[1] * greenScale) >> 8,
+									 (curpal[2] * blueScale) >> 8,
+									 (uint) - 1);
 		curpal += 3;
 	}
 }