[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.199,1.200 events.cpp,1.69,1.70 font.cpp,1.36,1.37 gfx.cpp,1.67,1.68 interface.cpp,1.158,1.159 isomap.cpp,1.62,1.63 rscfile.cpp,1.49,1.50 saga.cpp,1.142,1.143 saveload.cpp,1.28,1.29 scene.cpp,1.154,1.155 sfuncs.cpp,1.174,1.175 sthread.cpp,1.107,1.108
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Tue Oct 11 10:39:53 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28231
Modified Files:
actor.cpp events.cpp font.cpp gfx.cpp interface.cpp isomap.cpp
rscfile.cpp saga.cpp saveload.cpp scene.cpp sfuncs.cpp
sthread.cpp
Log Message:
Cleanups. Mostly whitespace.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- actor.cpp 11 Oct 2005 02:22:53 -0000 1.199
+++ actor.cpp 11 Oct 2005 17:39:31 -0000 1.200
@@ -1033,7 +1033,7 @@
_activeSpeech.drawRect.left = _activeSpeech.speechBox.left;
}
- height2 = actor->_screenPosition.y - 50;
+ height2 = actor->_screenPosition.y - 50;
_activeSpeech.speechBox.top = _activeSpeech.drawRect.top = MAX(10, (height2 - height) / 2);
} else {
_activeSpeech.drawRect.left = _activeSpeech.speechBox.left;
Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- events.cpp 8 Oct 2005 15:20:11 -0000 1.69
+++ events.cpp 11 Oct 2005 17:39:31 -0000 1.70
@@ -52,7 +52,7 @@
// Function to process event list once per frame.
// First advances event times, then processes each event with the appropriate
-// handler depending on the type of event.
+// handler depending on the type of event.
int Events::handleEvents(long msec) {
Event *event_p;
@@ -100,7 +100,7 @@
} else {
// If there is an event chain present, move the next event
// in the chain up, adjust it by the previous delta time,
- // and reprocess the event */
+ // and reprocess the event
delta_time = event_p->time;
Event *from_chain = event_p->chain;
memcpy(event_p, from_chain, sizeof(*event_p));
Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- font.cpp 28 Sep 2005 06:33:13 -0000 1.36
+++ font.cpp 11 Oct 2005 17:39:31 -0000 1.37
@@ -222,7 +222,7 @@
// "Hollow out" character to prevent overdraw
for (row = 0; row < font->normal.header.charHeight; row++) {
for (currentByte = 0; currentByte < font->outline.fontCharEntry[i].byteWidth; currentByte++) {
- destPointer2 = font->outline.font + font->outline.header.rowLength * (row + 1) + font->outline.fontCharEntry[i].index + currentByte;
+ destPointer2 = font->outline.font + font->outline.header.rowLength * (row + 1) + font->outline.fontCharEntry[i].index + currentByte;
if (currentByte > 0) {
// Get last two columns from previous byte
srcPointer = font->normal.font + font->normal.header.rowLength * row + font->normal.fontCharEntry[i].index + (currentByte - 1);
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- gfx.cpp 9 Oct 2005 19:43:15 -0000 1.67
+++ gfx.cpp 11 Oct 2005 17:39:31 -0000 1.68
@@ -54,7 +54,7 @@
}
Gfx::~Gfx() {
- _backBuffer.free();
+ _backBuffer.free();
}
void Surface::drawPalette() {
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- interface.cpp 11 Oct 2005 02:51:17 -0000 1.158
+++ interface.cpp 11 Oct 2005 17:39:31 -0000 1.159
@@ -1505,7 +1505,7 @@
rect.right = rect.left + _vm->getDisplayInfo().saveReminderWidth;
rect.bottom = rect.top + _vm->getDisplayInfo().saveReminderHeight;
- _vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _vm->_sprite->_saveReminderSprites,
+ _vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _vm->_sprite->_saveReminderSprites,
_saveReminderState == 1 ? _vm->getDisplayInfo().saveReminderFirstSpriteNumber : _vm->getDisplayInfo().saveReminderSecondSpriteNumber,
rect, 256);
@@ -1606,7 +1606,7 @@
//inventory stuff
void Interface::inventoryChangePos(int chg) {
if ((chg < 0 && _inventoryStart + chg >= 0) ||
- (chg > 0 && _inventoryStart < _inventoryEnd)) {
+ (chg > 0 && _inventoryStart < _inventoryEnd)) {
_inventoryStart += chg;
draw();
}
@@ -1632,7 +1632,7 @@
_inventoryStart = 0;
}
- _inventoryEnd = (_inventoryCount - 1 - cols) / cols * cols;
+ _inventoryEnd = (_inventoryCount - 1 - cols) / cols * cols;
if (_inventoryEnd < 0) {
_inventoryEnd = 0;
}
@@ -1962,7 +1962,7 @@
}
bool Interface::converseAddText(const char *text, int replyId, byte replyFlags, int replyBit) {
- int count = 0; // count how many pieces of text per string
+ int count = 0; // count how many pieces of text per string
int i;
int len;
byte c;
@@ -1994,10 +1994,10 @@
_converseText[_converseTextCount].text[i] = 0;
_converseText[_converseTextCount].textNum = count;
- _converseText[_converseTextCount].stringNum = _converseStrCount;
- _converseText[_converseTextCount].replyId = replyId;
- _converseText[_converseTextCount].replyFlags = replyFlags;
- _converseText[_converseTextCount].replyBit = replyBit;
+ _converseText[_converseTextCount].stringNum = _converseStrCount;
+ _converseText[_converseTextCount].replyId = replyId;
+ _converseText[_converseTextCount].replyFlags = replyFlags;
+ _converseText[_converseTextCount].replyBit = replyBit;
_converseTextCount++;
count++;
@@ -2104,7 +2104,7 @@
void Interface::converseChangePos(int chg) {
if ((chg < 0 && _converseStartPos + chg >= 0) ||
- (chg > 0 && _converseStartPos < _converseEndPos)) {
+ (chg > 0 && _converseStartPos < _converseEndPos)) {
_converseStartPos += chg;
draw();
}
@@ -2298,7 +2298,7 @@
_mapPanelCrossHairState = !_mapPanelCrossHairState;
Point mapPosition = _vm->_isoMap->getMapPosition();
- Rect screen(_vm->getDisplayWidth(), _vm->_scene->getHeight());
+ Rect screen(_vm->getDisplayWidth(), _vm->_scene->getHeight());
if (screen.contains(mapPosition)) {
_vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _vm->_sprite->_mainSprites,
Index: isomap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/isomap.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- isomap.cpp 8 Oct 2005 15:20:11 -0000 1.62
+++ isomap.cpp 11 Oct 2005 17:39:31 -0000 1.63
@@ -426,7 +426,7 @@
}
-void IsoMap::drawTiles(Surface *ds, const Location *location) {
+void IsoMap::drawTiles(Surface *ds, const Location *location) {
Point view1;
Point fineScroll;
Point tileScroll;
Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- rscfile.cpp 11 Oct 2005 02:22:53 -0000 1.49
+++ rscfile.cpp 11 Oct 2005 17:39:31 -0000 1.50
@@ -45,13 +45,13 @@
struct MacResource {
int16 id;
int16 nameOffset;
- byte attr;
+ byte attr;
int32 dataOffset;
byte name[255];
};
struct MacResType {
- uint32 id;
+ uint32 id;
int16 items;
int16 maxItemId;
int16 offset;
@@ -178,7 +178,7 @@
macMapLength = context->file->readUint32BE();
if (macDataOffset >= context->file->size() || macMapOffset >= context->file->size() ||
- macDataLength + macMapLength > context->file->size()) {
+ macDataLength + macMapLength > context->file->size()) {
return false;
}
@@ -392,7 +392,7 @@
uint32 Resource::convertResourceId(uint32 resourceId) {
- if ((_vm->getGameType() == GType_ITE) && (_vm->getFeatures() & GF_MAC_RESOURCES)) {
+ if (_vm->getGameType() == GType_ITE && _vm->isMacResources()) {
if (resourceId > 1537) {
return resourceId - 2;
} else {
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- saga.cpp 8 Oct 2005 22:09:21 -0000 1.142
+++ saga.cpp 11 Oct 2005 17:39:31 -0000 1.143
@@ -57,7 +57,7 @@
static const GameSettings saga_games[] = {
{"ite", "Inherit the Earth", 0},
- {"ite-demo", "Inherit the Earth (Demo)", 0},
+ {"ite-demo", "Inherit the Earth (Demo)", 0},
{"ihnm", "I Have No Mouth and I Must Scream", GF_DEFAULT_TO_1X_SCALER },
{"ihnm-demo", "I Have No Mouth and I Must Scream (Demo)", GF_DEFAULT_TO_1X_SCALER },
{0, 0, 0}
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saveload.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- saveload.cpp 11 Oct 2005 17:20:30 -0000 1.28
+++ saveload.cpp 11 Oct 2005 17:39:31 -0000 1.29
@@ -200,7 +200,7 @@
void SagaEngine::load(const char *fileName) {
Common::InSaveFile *in;
- int commonBufferSize;
+ int commonBufferSize;
int sceneNumber, insetSceneNumber;
int mapx, mapy;
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- scene.cpp 11 Oct 2005 02:44:25 -0000 1.154
+++ scene.cpp 11 Oct 2005 17:39:31 -0000 1.155
@@ -304,7 +304,7 @@
endScene();
- // Delete the current head in scene queue
+ // Delete the current head in scene queue
queueIterator = _sceneQueue.begin();
if (queueIterator == _sceneQueue.end()) {
return;
@@ -316,7 +316,7 @@
return;
}
- // Load the head in scene queue
+ // Load the head in scene queue
sceneQueue = queueIterator.operator->();
loadScene(sceneQueue);
@@ -364,12 +364,12 @@
}
static struct SceneSubstitutes {
- int sceneId;
- const char *message;
- const char *title;
- const char *image;
+ int sceneId;
+ const char *message;
+ const char *title;
+ const char *image;
} sceneSubstitutes[] = {
- {
+ {
7,
"Tycho says he knows much about the northern lands. Can Rif convince "
"the Dog to share this knowledge?",
@@ -377,7 +377,7 @@
"tycho.bbm"
},
- {
+ {
27,
"The scene of the crime may hold many clues, but will the servants of "
"the Sanctuary trust Rif?",
@@ -385,7 +385,7 @@
"sanctuar.bbm"
},
- {
+ {
5,
"The Rats hold many secrets that could guide Rif on his quest -- assuming "
"he can get past the doorkeeper.",
@@ -393,7 +393,7 @@
"ratdoor.bbm"
},
- {
+ {
2,
"The Ferrets enjoy making things and have the materials to do so. How can "
"that help Rif?",
@@ -401,14 +401,14 @@
"ferrets.bbm"
},
- {
+ {
67,
"What aid can the noble King of the Elks provide to Rif and his companions?",
"The Realm of the Forest King",
"elkenter.bbm"
},
- {
+ {
3,
"The King holds Rif's sweetheart hostage. Will the Boar provide any "
"assistance to Rif?",
Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- sfuncs.cpp 11 Oct 2005 01:00:56 -0000 1.174
+++ sfuncs.cpp 11 Oct 2005 17:39:31 -0000 1.175
@@ -419,7 +419,7 @@
ActorData *actor;
actorId = thread->pop();
- actorDirection = thread->pop();
+ actorDirection = thread->pop();
actor = _vm->_actor->getActor(actorId);
actor->_facingDirection = actor->_actionDirection = actorDirection;
@@ -959,7 +959,7 @@
actorId = thread->pop();
flags = thread->pop();
cycleFrameSequence = thread->pop();
- cycleDelay = thread->pop();
+ cycleDelay = thread->pop();
actor = _vm->_actor->getActor(actorId);
@@ -1067,7 +1067,7 @@
actorId = thread->pop();
actorLocation.x = thread->pop();
actorLocation.y = thread->pop();
- walkFrameSequence = thread->pop();
+ walkFrameSequence = thread->pop();
actor = _vm->_actor->getActor(actorId);
actorLocation.z = actor->_location.z;
@@ -1096,9 +1096,9 @@
actorId = thread->pop();
actorLocation.x = thread->pop();
actorLocation.y = thread->pop();
- actorDirection = thread->pop();
- frameType = thread->pop();
- frameOffset = thread->pop();
+ actorDirection = thread->pop();
+ frameType = thread->pop();
+ frameOffset = thread->pop();
debug(1, "sfPlaceActor(id = 0x%x, x=%d, y=%d, dir=%d, frameType=%d, frameOffset=%d)", actorId, actorLocation.x,
actorLocation.y, actorDirection, frameType, frameOffset);
@@ -1152,7 +1152,7 @@
objectId = thread->pop();
actorLocation.x = thread->pop();
actorLocation.y = thread->pop();
- walkFlags = thread->pop();
+ walkFlags = thread->pop();
actor = _vm->_actor->getActor(actorId);
actorLocation.z = actor->_location.z;
@@ -1189,7 +1189,7 @@
objectId = thread->pop();
actorLocation.x = thread->pop();
actorLocation.y = thread->pop();
- walkFlags = thread->pop();
+ walkFlags = thread->pop();
actor = _vm->_actor->getActor(actorId);
actorLocation.z = actor->_location.z;
@@ -1834,7 +1834,7 @@
if (flags & kReplyOnce) {
addr = _conversingThread->_staticBase + (bitOffset >> 3);
- *addr |= (1 << (bitOffset & 7));
+ *addr |= (1 << (bitOffset & 7));
}
}
Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- sthread.cpp 11 Oct 2005 17:20:30 -0000 1.107
+++ sthread.cpp 11 Oct 2005 17:39:31 -0000 1.108
@@ -189,7 +189,7 @@
void Script::completeThread(void) {
int limit = (_vm->getGameType() == GType_IHNM) ? 100 : 40;
- for (int i = 0; i < limit && !_threadList.isEmpty() ; i++)
+ for (int i = 0; i < limit && !_threadList.isEmpty(); i++)
executeThreads(0);
}
More information about the Scummvm-git-logs
mailing list