aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-11-28 07:55:25 +0000
committerTorbjörn Andersson2003-11-28 07:55:25 +0000
commit9fdaf04a21259ee5fdcf2fef88078934981b6bbe (patch)
tree9e34d9bfc62927e8917098111a4d6f6b10d692f5
parent9c6e5ce50ad9e1e7994ceaef5e7e5be10ec996f4 (diff)
downloadscummvm-rg350-9fdaf04a21259ee5fdcf2fef88078934981b6bbe.tar.gz
scummvm-rg350-9fdaf04a21259ee5fdcf2fef88078934981b6bbe.tar.bz2
scummvm-rg350-9fdaf04a21259ee5fdcf2fef88078934981b6bbe.zip
Some formatting changes, and a few debug message corrections.
svn-id: r11384
-rw-r--r--sword2/anims.cpp20
-rw-r--r--sword2/interpreter.cpp4
-rw-r--r--sword2/resman.cpp4
3 files changed, 14 insertions, 14 deletions
diff --git a/sword2/anims.cpp b/sword2/anims.cpp
index 51eefcfbe4..530b13b45b 100644
--- a/sword2/anims.cpp
+++ b/sword2/anims.cpp
@@ -298,7 +298,7 @@ int32 Logic::fnSetFrame(int32 *params) {
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::fnNoSprite(int32 *params) {
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::fnBackPar0Sprite(int32 *params) {
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::fnBackPar1Sprite(int32 *params) {
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::fnBackSprite(int32 *params) {
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::fnSortSprite(int32 *params) {
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::fnForeSprite(int32 *params) {
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::fnForePar0Sprite(int32 *params) {
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::fnForePar1Sprite(int32 *params) {
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::fnShadedSprite(int32 *params) {
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;
diff --git a/sword2/interpreter.cpp b/sword2/interpreter.cpp
index 105b847c49..92cf4bdbf4 100644
--- a/sword2/interpreter.cpp
+++ b/sword2/interpreter.cpp
@@ -600,7 +600,7 @@ int Logic::runScript(char *scriptData, char *objectData, uint32 *offset) {
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 @@ int Logic::runScript(char *scriptData, char *objectData, uint32 *offset) {
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]);
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index e1d49c9472..49098b7021 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -384,8 +384,8 @@ uint8 *ResourceManager::openResource(uint32 res, bool dump) {
// 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;