aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorJordi Vilalta Prat2008-01-28 00:14:17 +0000
committerJordi Vilalta Prat2008-01-28 00:14:17 +0000
commitd6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd (patch)
treee6e98f266610f6428c248aed6abc75e637e45231 /engines/sword2
parent66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (diff)
downloadscummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.gz
scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.bz2
scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.zip
Fixed the spaces before tabs.
svn-id: r30667
Diffstat (limited to 'engines/sword2')
-rw-r--r--engines/sword2/debug.cpp20
-rw-r--r--engines/sword2/function.cpp18
-rw-r--r--engines/sword2/layers.cpp2
-rw-r--r--engines/sword2/mouse.cpp2
-rw-r--r--engines/sword2/object.h2
-rw-r--r--engines/sword2/palette.cpp4
-rw-r--r--engines/sword2/resman.cpp2
-rw-r--r--engines/sword2/router.cpp14
-rw-r--r--engines/sword2/router.h4
-rw-r--r--engines/sword2/saveload.cpp2
-rw-r--r--engines/sword2/screen.cpp4
-rw-r--r--engines/sword2/speech.cpp4
-rw-r--r--engines/sword2/sprite.cpp2
13 files changed, 40 insertions, 40 deletions
diff --git a/engines/sword2/debug.cpp b/engines/sword2/debug.cpp
index e6662a4ef7..8f9f54ad5c 100644
--- a/engines/sword2/debug.cpp
+++ b/engines/sword2/debug.cpp
@@ -144,7 +144,7 @@ void Debugger::buildDebugText() {
makeDebugTextBlock(buf, 500, 380);
}
- // current text number & speech-sample resource id
+ // current text number & speech-sample resource id
if (_displayTextNumbers) {
if (_textNumber) {
@@ -152,7 +152,7 @@ void Debugger::buildDebugText() {
if (_vm->_logic->readVar(SYSTEM_WANT_PREVIOUS_LINE))
sprintf(buf, "backwards");
else
- sprintf(buf, "forwards");
+ sprintf(buf, "forwards");
makeDebugTextBlock(buf, 0, 340);
}
@@ -163,7 +163,7 @@ void Debugger::buildDebugText() {
sprintf(buf, "pos: %d", _textNumber & 0xffff);
makeDebugTextBlock(buf, 0, 370);
- sprintf(buf, "TEXT: %d", _vm->_logic->_officialTextNumber);
+ sprintf(buf, "TEXT: %d", _vm->_logic->_officialTextNumber);
makeDebugTextBlock(buf, 0, 385);
}
}
@@ -197,7 +197,7 @@ void Debugger::buildDebugText() {
_vm->_logic->readVar(MOUSE_X),
_vm->_logic->readVar(MOUSE_Y));
- makeDebugTextBlock(buf, 0, 15);
+ makeDebugTextBlock(buf, 0, 15);
uint32 mouseTouching = _vm->_mouse->getMouseTouching();
@@ -218,7 +218,7 @@ void Debugger::buildDebugText() {
makeDebugTextBlock(buf, 0, 30);
- // player coords & graphic info
+ // player coords & graphic info
// if player objct has a graphic
if (_graphAnimRes)
@@ -237,22 +237,22 @@ void Debugger::buildDebugText() {
makeDebugTextBlock(buf, 0, 45);
- // frames-per-second counter
+ // frames-per-second counter
sprintf(buf, "fps %d", _vm->_screen->getFps());
makeDebugTextBlock(buf, 440, 0);
- // location number
+ // location number
sprintf(buf, "location=%d", _vm->_logic->readVar(LOCATION));
makeDebugTextBlock(buf, 440, 15);
- // "result" variable
+ // "result" variable
sprintf(buf, "result=%d", _vm->_logic->readVar(RESULT));
makeDebugTextBlock(buf, 440, 30);
- // no. of events in event list
+ // no. of events in event list
sprintf(buf, "events=%d", _vm->_logic->countEvents());
makeDebugTextBlock(buf, 440, 45);
@@ -352,7 +352,7 @@ void Debugger::drawDebugGraphics() {
plotCrossHair(mouseX + screenInfo->scroll_offset_x, mouseY + screenInfo->scroll_offset_y, 215);
}
- // mouse area rectangle / sprite box rectangle when testing anims
+ // mouse area rectangle / sprite box rectangle when testing anims
if (_vm->_logic->readVar(SYSTEM_TESTING_ANIMS)) {
// draw box around current frame
diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp
index 99211c3ece..84a5b5af76 100644
--- a/engines/sword2/function.cpp
+++ b/engines/sword2/function.cpp
@@ -57,7 +57,7 @@ int32 Logic::fnTestFlags(int32 *params) {
int32 Logic::fnRegisterStartPoint(int32 *params) {
// params: 0 id of startup script to call - key
- // 1 pointer to ascii message
+ // 1 pointer to ascii message
int32 key = params[0];
char *name = (char *)decodePtr(params[1]);
@@ -521,7 +521,7 @@ int32 Logic::fnPassMega(int32 *params) {
// remember, we cannot simply read a compact any longer but instead
// must request it from the object itself
- // params: 0 pointer to a mega structure
+ // params: 0 pointer to a mega structure
memcpy(_engineMega, decodePtr(params[0]), ObjectMega::size());
return IR_CONT;
@@ -1118,7 +1118,7 @@ int32 Logic::fnISpeak(int32 *params) {
if (_leftClickDelay)
_leftClickDelay--;
- if (_rightClickDelay)
+ if (_rightClickDelay)
_rightClickDelay--;
return IR_REPEAT;
@@ -1770,9 +1770,9 @@ int32 Logic::fnSetPlayerActionEvent(int32 *params) {
int32 Logic::fnSetScrollCoordinate(int32 *params) {
// params: 0 feet_x value
- // 1 feet_y value
+ // 1 feet_y value
- // Called feet_x and feet_y to retain intellectual compatibility with
+ // Called feet_x and feet_y to retain intellectual compatibility with
// Sword1!
//
// feet_x & feet_y refer to the physical screen coords where the
@@ -1806,7 +1806,7 @@ int32 Logic::fnStandAtAnim(int32 *params) {
int32 Logic::fnSetScrollLeftMouse(int32 *params) {
// params: 0 pointer to object's mouse structure
- byte *ob_mouse = decodePtr(params[0]);
+ byte *ob_mouse = decodePtr(params[0]);
ScreenInfo *screenInfo = _vm->_screen->getScreenInfo();
// Highest priority
@@ -1966,7 +1966,7 @@ int32 Logic::fnGetPlayerSaveData(int32 *params) {
memcpy(ob_graph, _saveGraphic, ObjectGraphic::size());
memcpy(ob_mega, _saveMega, ObjectMega::size());
- // Any walk-data must be cleared - the player will be set to stand if
+ // Any walk-data must be cleared - the player will be set to stand if
// he was walking when saved.
ObjectMega obMega(ob_mega);
@@ -2115,7 +2115,7 @@ int32 Logic::fnFaceMega(int32 *params) {
int32 Logic::fnPlaySequence(int32 *params) {
// params: 0 pointer to null-terminated ascii filename
- // 1 number of frames in the sequence, used for PSX.
+ // 1 number of frames in the sequence, used for PSX.
char filename[30];
@@ -2131,7 +2131,7 @@ int32 Logic::fnPlaySequence(int32 *params) {
strcpy(filename, (const char *)decodePtr(params[0]));
// Write to walkthrough file (zebug0.txt)
- debug(5, "PLAYING SEQUENCE \"%s\"", filename);
+ debug(5, "PLAYING SEQUENCE \"%s\"", filename);
// don't want to carry on streaming game music when cutscene starts!
fnStopMusic(NULL);
diff --git a/engines/sword2/layers.cpp b/engines/sword2/layers.cpp
index 6f8ed2f0b7..ba59889acb 100644
--- a/engines/sword2/layers.cpp
+++ b/engines/sword2/layers.cpp
@@ -154,7 +154,7 @@ void Screen::initBackground(int32 res, int32 new_palette) {
screenLayerTable.read(file + ResHeader::size());
if (screenLayerTable.maskOffset) {
- SpriteInfo spriteInfo;
+ SpriteInfo spriteInfo;
spriteInfo.x = 0;
spriteInfo.y = 0;
diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp
index a754f9810c..44d2383f78 100644
--- a/engines/sword2/mouse.cpp
+++ b/engines/sword2/mouse.cpp
@@ -1078,7 +1078,7 @@ void Mouse::setMouse(uint32 res) {
if (res == NORMAL_MOUSE_ID)
setMouseAnim(icon, len, RDMOUSE_NOFLASH);
else
- setMouseAnim(icon, len, RDMOUSE_FLASH);
+ setMouseAnim(icon, len, RDMOUSE_FLASH);
_vm->_resman->closeResource(res);
} else {
diff --git a/engines/sword2/object.h b/engines/sword2/object.h
index 7ee8766105..57f020eb63 100644
--- a/engines/sword2/object.h
+++ b/engines/sword2/object.h
@@ -110,7 +110,7 @@ public:
// in low word:
-#define NO_SPRITE 0x00000000 // don't print
+#define NO_SPRITE 0x00000000 // don't print
#define BGP0_SPRITE 0x00000001 // fixed to background parallax[0]
#define BGP1_SPRITE 0x00000002 // fixed to background parallax[1]
#define BACK_SPRITE 0x00000004 // 'background' sprite, fixed to main background
diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp
index 127340ea89..1b9cd28d25 100644
--- a/engines/sword2/palette.cpp
+++ b/engines/sword2/palette.cpp
@@ -56,7 +56,7 @@ void Screen::startNewPalette() {
_vm->_resman->closeResource(_thisScreen.background_layer_id);
fadeUp();
- _thisScreen.new_palette = 0;
+ _thisScreen.new_palette = 0;
}
void Screen::setFullPalette(int32 palRes) {
@@ -83,7 +83,7 @@ void Screen::setFullPalette(int32 palRes) {
// file anyway eg. for pausing & unpausing during the eclipse
// unpausing (fudged for location 13)
- if (palRes == -1) {
+ if (palRes == -1) {
// we really meant '0'
palRes = 0;
}
diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp
index 46637dd4ef..88a1f6251a 100644
--- a/engines/sword2/resman.cpp
+++ b/engines/sword2/resman.cpp
@@ -539,7 +539,7 @@ void ResourceManager::remove(int res) {
void ResourceManager::removeAll() {
// We need to clear the FX queue, because otherwise the sound system
// will still believe that the sound resources are in memory. We also
- // need to kill the movie lead-in/out.
+ // need to kill the movie lead-in/out.
_vm->_sound->clearFxQueue(true);
diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp
index 6be155dd85..2fc5c9efd5 100644
--- a/engines/sword2/router.cpp
+++ b/engines/sword2/router.cpp
@@ -58,12 +58,12 @@ namespace Sword2 {
/****************************************************************************
* JROUTER.C polygon router with modular walks
- * using a tree of modules
- * 21 july 94
+ * using a tree of modules
+ * 21 july 94
* 3 november 94
* System currently works by scanning grid data and coming up with a ROUTE
* as a series of way points(nodes), the smoothest eight directional PATH
- * through these nodes is then found, and a WALK created to fit the PATH.
+ * through these nodes is then found, and a WALK created to fit the PATH.
*
* Two funtions are called by the user, RouteFinder creates a route as a
* module list, HardWalk creates an animation list from the module list.
@@ -175,7 +175,7 @@ void Router::freeAllRouteMem() {
int32 Router::routeFinder(byte *ob_mega, byte *ob_walkdata, int32 x, int32 y, int32 dir) {
/*********************************************************************
* RouteFinder.C polygon router with modular walks
- * 21 august 94
+ * 21 august 94
* 3 november 94
* routeFinder creates a list of modules that enables HardWalk to
* create an animation list.
@@ -190,9 +190,9 @@ int32 Router::routeFinder(byte *ob_mega, byte *ob_walkdata, int32 x, int32 y, in
*
* return 0 = failed to find a route
*
- * 1 = found a route
+ * 1 = found a route
*
- * 2 = mega already at target
+ * 2 = mega already at target
*
*********************************************************************/
@@ -294,7 +294,7 @@ int32 Router::getRoute() {
*
* static routeData _route[O_ROUTE_SIZE];
*
- * return 0 = failed to find a route
+ * return 0 = failed to find a route
*
* 1 = found a route
*
diff --git a/engines/sword2/router.h b/engines/sword2/router.h
index f5d7f65efe..c75bea6131 100644
--- a/engines/sword2/router.h
+++ b/engines/sword2/router.h
@@ -50,8 +50,8 @@ struct WalkData {
struct BarData {
int16 x1;
- int16 y1;
- int16 x2;
+ int16 y1;
+ int16 x2;
int16 y2;
int16 xmin;
int16 ymin;
diff --git a/engines/sword2/saveload.cpp b/engines/sword2/saveload.cpp
index c08ef99996..73da5dd98b 100644
--- a/engines/sword2/saveload.cpp
+++ b/engines/sword2/saveload.cpp
@@ -312,7 +312,7 @@ uint32 Sword2Engine::restoreFromBuffer(byte *buffer, uint32 size) {
readS.read(globalVars, _resman->fetchLen(1));
_resman->closeResource(CUR_PLAYER_ID);
- _resman->closeResource(1);
+ _resman->closeResource(1);
free(buffer);
diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp
index d4d286c018..1f6eb1b22d 100644
--- a/engines/sword2/screen.cpp
+++ b/engines/sword2/screen.cpp
@@ -479,7 +479,7 @@ void Screen::processLayer(byte *file, uint32 layer_number) {
layer_head.read(_vm->fetchLayerHeader(file, layer_number));
- SpriteInfo spriteInfo;
+ SpriteInfo spriteInfo;
spriteInfo.x = layer_head.x;
spriteInfo.y = layer_head.y;
@@ -679,7 +679,7 @@ void Screen::registerFrame(byte *ob_mouse, byte *ob_graph, byte *ob_mega, BuildU
// fill in the BuildUnit structure for this frame
- build_unit->anim_resource = obGraph.getAnimResource();
+ build_unit->anim_resource = obGraph.getAnimResource();
build_unit->anim_pc = obGraph.getAnimPc();
build_unit->layer_number = 0;
diff --git a/engines/sword2/speech.cpp b/engines/sword2/speech.cpp
index b6f77dde74..a0ddc333c2 100644
--- a/engines/sword2/speech.cpp
+++ b/engines/sword2/speech.cpp
@@ -146,7 +146,7 @@ void Logic::locateTalker(int32 *params) {
void Logic::formText(int32 *params) {
// params 0 pointer to ob_graphic
- // 1 pointer to ob_speech
+ // 1 pointer to ob_speech
// 2 pointer to ob_logic
// 3 pointer to ob_mega
// 4 encoded text number
@@ -213,7 +213,7 @@ bool Logic::wantSpeechForLine(uint32 wavId) {
// SFX (4214);
// 4214FXMeow!
case 4568: // trapdoor_13
- // SFX (4568);
+ // SFX (4568);
// 4568fx<door slamming>
case 4913: // LobineauSpeech
// SFX (tone2);
diff --git a/engines/sword2/sprite.cpp b/engines/sword2/sprite.cpp
index e6f17a1af1..bd452049aa 100644
--- a/engines/sword2/sprite.cpp
+++ b/engines/sword2/sprite.cpp
@@ -63,7 +63,7 @@ int32 Screen::decompressRLE256(byte *dst, byte *src, int32 decompSize) {
// source points to the start of the sprite data for input
// decompSize gives size of decompressed data in bytes
// dest points to start of destination buffer for decompressed
- // data
+ // data
byte headerByte; // block header byte
byte *endDest = dst + decompSize; // pointer to byte after end of decomp buffer