[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.46,1.47 interpreter.cpp,1.29,1.30 resman.cpp,1.75,1.76

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Thu Nov 27 23:56:04 CET 2003


Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv16798

Modified Files:
	anims.cpp interpreter.cpp resman.cpp 
Log Message:
Some formatting changes, and a few debug message corrections.


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- anims.cpp	16 Nov 2003 14:18:27 -0000	1.46
+++ anims.cpp	28 Nov 2003 07:55:25 -0000	1.47
@@ -298,7 +298,7 @@
 int32 Logic::fnNoSprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
- 	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+ 	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0xffff0000;
@@ -311,7 +311,7 @@
 int32 Logic::fnBackPar0Sprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
- 	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+ 	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0xffff0000;
@@ -324,7 +324,7 @@
 int32 Logic::fnBackPar1Sprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
- 	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+ 	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0xffff0000;
@@ -337,7 +337,7 @@
 int32 Logic::fnBackSprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
- 	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+ 	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0xffff0000;
@@ -350,7 +350,7 @@
 int32 Logic::fnSortSprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
- 	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+ 	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0xffff0000;
@@ -363,7 +363,7 @@
 int32 Logic::fnForeSprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
- 	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+ 	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0xffff0000;
@@ -376,7 +376,7 @@
 int32 Logic::fnForePar0Sprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
- 	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+ 	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0xffff0000;
@@ -389,7 +389,7 @@
 int32 Logic::fnForePar1Sprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
-	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0xffff0000;
@@ -402,7 +402,7 @@
 int32 Logic::fnShadedSprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
-	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0x0000ffff;
@@ -418,7 +418,7 @@
 int32 Logic::fnUnshadedSprite(int32 *params) {
 	// params:	0 pointer to object's graphic structure
 
-	Object_graphic	*ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
+	Object_graphic *ob_graphic = (Object_graphic *) _vm->_memory->intToPtr(params[0]);
 
 	// remove previous status (but don't affect the shading upper-word)
 	ob_graphic->type &= 0x0000ffff;

Index: interpreter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/interpreter.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- interpreter.cpp	27 Nov 2003 07:34:19 -0000	1.29
+++ interpreter.cpp	28 Nov 2003 07:55:25 -0000	1.30
@@ -600,7 +600,7 @@
 			break;
 		case OP_GTTHANE:
 			// '>='
-			debug(5, "%d > %d -> %d",
+			debug(5, "%d >= %d -> %d",
 				stack2[stackPointer2 - 2],
 				stack2[stackPointer2 - 1],
 				stack2[stackPointer2 - 2] >= stack2[stackPointer2 - 1]);
@@ -608,7 +608,7 @@
 			break;
 		case OP_LSTHANE:
 			// '<='
-			debug(5, "%d < %d -> %d",
+			debug(5, "%d <= %d -> %d",
 				stack2[stackPointer2 - 2],
 				stack2[stackPointer2 - 1],
 				stack2[stackPointer2 - 2] <= stack2[stackPointer2 - 1]);

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- resman.cpp	27 Nov 2003 07:34:19 -0000	1.75
+++ resman.cpp	28 Nov 2003 07:55:25 -0000	1.76
@@ -384,8 +384,8 @@
 	// returns ad of resource. Loads if not in memory
 	// retains a count
 	// resource can be aged out of memory if count = 0
-	// the resource is locked while count != 0 i.e. until a closeResource is
-	// called
+	// the resource is locked while count != 0 i.e. until a closeResource
+	// is called
 
 	File	file;
 	uint16	parent_res_file;





More information about the Scummvm-git-logs mailing list