[Scummvm-cvs-logs] CVS: scummvm/saga actor.h,1.68,1.69 isomap.cpp,1.45,1.46 list.h,1.7,1.8 saga.cpp,1.106,1.107 sdebug.cpp,1.29,1.30 sfuncs.cpp,1.108,1.109 sprite.cpp,1.48,1.49
Max Horn
fingolfin at users.sourceforge.net
Sun May 8 14:52:15 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.8,1.9 game.cpp,1.20,1.21 pack.cpp,1.4,1.5 parse.cpp,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.139,2.140 debugger.cpp,1.147,1.148 help.cpp,1.18,1.19 imuse_internal.h,2.40,2.41 resource_v7he.cpp,1.37,1.38 script_v72he.cpp,2.284,2.285 sprite_he.cpp,1.135,1.136 string.cpp,1.289,1.290
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28088/saga
Modified Files:
actor.h isomap.cpp list.h saga.cpp sdebug.cpp sfuncs.cpp
sprite.cpp
Log Message:
Comply to our coding conventions
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- actor.h 8 May 2005 14:04:03 -0000 1.68
+++ actor.h 8 May 2005 21:49:43 -0000 1.69
@@ -314,12 +314,12 @@
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 @@
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();
}
Index: isomap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/isomap.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- isomap.cpp 27 Apr 2005 11:51:10 -0000 1.45
+++ isomap.cpp 8 May 2005 21:49:43 -0000 1.46
@@ -923,7 +923,7 @@
return;
}
- while(1) {
+ while (1) {
mid = (upper + lower) / 2;
tilePoint = _searchArray.getQueue(mid);
@@ -1300,10 +1300,10 @@
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 ];
Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/list.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- list.h 1 Jan 2005 16:18:36 -0000 1.7
+++ list.h 8 May 2005 21:49:43 -0000 1.8
@@ -130,7 +130,7 @@
void remove(const T* val) {
for (iterator i = Common::List<T>::begin(); i != Common::List<T>::end(); ++i)
- if(val == i.operator->()) {
+ if (val == i.operator->()) {
erase(i);
return;
}
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- saga.cpp 24 Apr 2005 18:26:12 -0000 1.106
+++ saga.cpp 8 May 2005 21:49:43 -0000 1.107
@@ -296,7 +296,7 @@
_scene->startScene();
uint32 currentTicks;
- while(!_quit) {
+ while (!_quit) {
if (_console->isAttached())
_console->onFrame();
Index: sdebug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sdebug.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- sdebug.cpp 8 May 2005 14:04:06 -0000 1.29
+++ sdebug.cpp 8 May 2005 21:49:43 -0000 1.30
@@ -101,7 +101,7 @@
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 {
Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- sfuncs.cpp 8 May 2005 14:04:06 -0000 1.108
+++ sfuncs.cpp 8 May 2005 21:49:43 -0000 1.109
@@ -186,7 +186,7 @@
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);
}
}
Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- sprite.cpp 22 Apr 2005 17:40:08 -0000 1.48
+++ sprite.cpp 8 May 2005 21:49:44 -0000 1.49
@@ -432,7 +432,7 @@
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;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.8,1.9 game.cpp,1.20,1.21 pack.cpp,1.4,1.5 parse.cpp,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.139,2.140 debugger.cpp,1.147,1.148 help.cpp,1.18,1.19 imuse_internal.h,2.40,2.41 resource_v7he.cpp,1.37,1.38 script_v72he.cpp,2.284,2.285 sprite_he.cpp,1.135,1.136 string.cpp,1.289,1.290
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list