From cca744f69a9eb079a314c8f39af1faa4e7b1e5a6 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 8 May 2005 21:49:52 +0000 Subject: Comply to our coding conventions svn-id: r17975 --- saga/actor.h | 8 ++++---- saga/isomap.cpp | 6 +++--- saga/list.h | 2 +- saga/saga.cpp | 2 +- saga/sdebug.cpp | 2 +- saga/sfuncs.cpp | 2 +- saga/sprite.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'saga') diff --git a/saga/actor.h b/saga/actor.h index 2afc7ec806..6064e259ef 100644 --- a/saga/actor.h +++ b/saga/actor.h @@ -314,12 +314,12 @@ public: out.writeSint32LE(frameNumber); out.writeSint32LE(tileDirectionsAlloced); - for(int i = 0; i < tileDirectionsAlloced; i++) { + for (int i = 0; i < tileDirectionsAlloced; i++) { out.writeByte(tileDirections[i]); } out.writeSint32LE(walkStepsAlloced); - for(int i = 0; i < walkStepsAlloced; i++) { + for (int i = 0; i < walkStepsAlloced; i++) { out.writeSint16LE(walkStepsPoints[i].x); out.writeSint16LE(walkStepsPoints[i].y); } @@ -349,12 +349,12 @@ public: setTileDirectionsSize(in.readSint32LE(), true); - for(int i = 0; i < tileDirectionsAlloced; i++) { + for (int i = 0; i < tileDirectionsAlloced; i++) { tileDirections[i] = in.readByte(); } setWalkStepsPointsSize(in.readSint32LE(), true); - for(int i = 0; i < walkStepsAlloced; i++) { + for (int i = 0; i < walkStepsAlloced; i++) { walkStepsPoints[i].x = in.readSint16LE(); walkStepsPoints[i].y = in.readSint16LE(); } diff --git a/saga/isomap.cpp b/saga/isomap.cpp index 8a3e90a8c5..98fc236270 100644 --- a/saga/isomap.cpp +++ b/saga/isomap.cpp @@ -923,7 +923,7 @@ void IsoMap::pushPoint(int16 u, int16 v, uint16 cost, uint16 direction) { return; } - while(1) { + while (1) { mid = (upper + lower) / 2; tilePoint = _searchArray.getQueue(mid); @@ -1300,10 +1300,10 @@ void IsoMap::findTilePath(ActorData* actor, const Location &start, const Locatio if (terrainMask & SAGA_IMPASSABLE) { continue; } else { - if(terrainMask & (1 << kTerrRough)) { + if (terrainMask & (1 << kTerrRough)) { tdir = &hardDirTable[ dir ]; } else { - if(terrainMask & (1 << kTerrNone)) { + if (terrainMask & (1 << kTerrNone)) { tdir = &normalDirTable[ dir ]; } else { tdir = &easyDirTable[ dir ]; diff --git a/saga/list.h b/saga/list.h index b27a4f9ce6..f53dcd0b18 100644 --- a/saga/list.h +++ b/saga/list.h @@ -130,7 +130,7 @@ public: void remove(const T* val) { for (iterator i = Common::List::begin(); i != Common::List::end(); ++i) - if(val == i.operator->()) { + if (val == i.operator->()) { erase(i); return; } diff --git a/saga/saga.cpp b/saga/saga.cpp index d10ea7638b..462517d09b 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -296,7 +296,7 @@ int SagaEngine::go() { _scene->startScene(); uint32 currentTicks; - while(!_quit) { + while (!_quit) { if (_console->isAttached()) _console->onFrame(); diff --git a/saga/sdebug.cpp b/saga/sdebug.cpp index 7235023c67..83042ab953 100644 --- a/saga/sdebug.cpp +++ b/saga/sdebug.cpp @@ -101,7 +101,7 @@ int Script::SDebugPrintInstr(ScriptThread *thread) { sprintf(tmp_buf, "%02X", param); SD_ADDTXT(tmp_buf); /* - if((param >= 0) && (param < diag_list->n_dialogue)) { + if ((param >= 0) && (param < diag_list->n_dialogue)) { debug(2, " ; \"%.*s\"", SCRIPT_STRINGLIMIT, diag_list->str[param]); } else { diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index 02881efef5..8c190a6a0b 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -186,7 +186,7 @@ void Script::sfTakeObject(SCRIPTFUNC_PARAMS) { obj = _vm->_actor->getObj(objectId); if (obj->sceneNumber != ITE_SCENE_INV) { obj->sceneNumber = ITE_SCENE_INV; - //4debug for(int j=0;j<17;j++) + //4debug for (int j=0;j<17;j++) _vm->_interface->addToInventory(objectId); } } diff --git a/saga/sprite.cpp b/saga/sprite.cpp index 038e6ba001..a7b0d09e90 100644 --- a/saga/sprite.cpp +++ b/saga/sprite.cpp @@ -432,7 +432,7 @@ void Sprite::scaleBuffer(const byte *src, int width, int height, int scale) { for (int i = 0; i < height; i++) { vskip += skip; - if(vskip < skip) { // We had an overflow + if (vskip < skip) { // We had an overflow src += width; } else { hskip = 0x80; -- cgit v1.2.3