[Scummvm-cvs-logs] SF.net SVN: scummvm:[53825] scummvm/trunk/engines/hugo
strangerke at users.sourceforge.net
strangerke at users.sourceforge.net
Mon Oct 25 15:31:02 CEST 2010
Revision: 53825
http://scummvm.svn.sourceforge.net/scummvm/?rev=53825&view=rev
Author: strangerke
Date: 2010-10-25 13:31:01 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
HUGO: cleanup: Suppress trailing spaces and tabs
Modified Paths:
--------------
scummvm/trunk/engines/hugo/display.cpp
scummvm/trunk/engines/hugo/file.cpp
scummvm/trunk/engines/hugo/file_v3d.cpp
scummvm/trunk/engines/hugo/hugo.cpp
scummvm/trunk/engines/hugo/hugo.h
scummvm/trunk/engines/hugo/intro_v3d.cpp
scummvm/trunk/engines/hugo/object.cpp
scummvm/trunk/engines/hugo/object.h
scummvm/trunk/engines/hugo/object_v1d.cpp
scummvm/trunk/engines/hugo/parser.h
scummvm/trunk/engines/hugo/parser_v3d.cpp
scummvm/trunk/engines/hugo/route.cpp
scummvm/trunk/engines/hugo/schedule.h
scummvm/trunk/engines/hugo/schedule_v1d.cpp
scummvm/trunk/engines/hugo/schedule_v3d.cpp
scummvm/trunk/engines/hugo/sound.cpp
scummvm/trunk/engines/hugo/sound.h
scummvm/trunk/engines/hugo/util.cpp
Modified: scummvm/trunk/engines/hugo/display.cpp
===================================================================
--- scummvm/trunk/engines/hugo/display.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/display.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -213,7 +213,7 @@
if (OVERLAP(list, bp))
coalesce[c++] = b;
}
-
+
// Any overlapping blit rects?
if (c == 0) { // None, add a new entry
blist[blen++] = *list;
@@ -377,7 +377,7 @@
void Screen::userHelp() {
// Introduce user to the game
// DOS versions Only
- Utils::Box(BOX_ANY , "%s",
+ Utils::Box(BOX_ANY , "%s",
"F1 - Press F1 again\n"
" for instructions\n"
"F2 - Sound on/off\n"
@@ -421,7 +421,7 @@
_backBuffer[320 * (y + (2 * shapeSize - 1) - i) + (x + shapeSize + j)] = color2;
_frontBuffer[320 * (y + (2 * shapeSize - 1) - i) + (x + shapeSize + j)] = color2;
}
- }
+ }
}
void Screen::drawRectangle(bool filledFl, uint16 x1, uint16 y1, uint16 x2, uint16 y2, int color) {
Modified: scummvm/trunk/engines/hugo/file.cpp
===================================================================
--- scummvm/trunk/engines/hugo/file.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/file.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -97,7 +97,7 @@
if ((seqPtr = (seq_t *)malloc(sizeof(seq_t))) == 0)
Utils::Error(HEAP_ERR, "%s", name);
}
-
+
// Find size of image data in 8-bit DIB format
// Note save of x2 - marks end of valid data before garbage
uint16 bytesPerLine4 = PCC_header.bytesPerLine * 4; // 4-bit bpl
Modified: scummvm/trunk/engines/hugo/file_v3d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/file_v3d.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/file_v3d.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -50,7 +50,7 @@
debugC(1, kDebugFile, "readBackground(%d)", screenIndex);
_sceneryArchive1.seek((uint32) screenIndex * sizeof(sceneBlock_t), SEEK_SET);
-
+
sceneBlock_t sceneBlock; // Read a database header entry
sceneBlock.scene_off = _sceneryArchive1.readUint32LE();
sceneBlock.scene_len = _sceneryArchive1.readUint32LE();
@@ -101,7 +101,7 @@
image_pt tmpImage = image; // temp ptr to overlay file
_sceneryArchive1.seek((uint32)screenNum * sizeof(sceneBlock_t), SEEK_SET);
-
+
sceneBlock_t sceneBlock; // Database header entry
sceneBlock.scene_off = _sceneryArchive1.readUint32LE();
sceneBlock.scene_len = _sceneryArchive1.readUint32LE();
@@ -113,7 +113,7 @@
sceneBlock.ob_len = _sceneryArchive1.readUint32LE();
uint32 i = 0;
-
+
if (screenNum < 20) {
switch (overlayType) {
case BOUNDARY:
@@ -137,7 +137,7 @@
image[i] = 0;
return;
}
-
+
// Read in the overlay file using MAC Packbits. (We're not proud!)
int16 k = 0; // byte count
do {
@@ -149,7 +149,7 @@
*tmpImage++ = _sceneryArchive1.readByte();
} else { // Repeat next byte -data+1 times
int16 j = _sceneryArchive1.readByte();
-
+
for (i = 0; i < (byte)(-data + 1); i++, k++)
*tmpImage++ = j;
}
@@ -177,7 +177,7 @@
image[i] = 0;
return;
}
-
+
// Read in the overlay file using MAC Packbits. (We're not proud!)
int16 k = 0; // byte count
do {
@@ -189,7 +189,7 @@
*tmpImage++ = _sceneryArchive2.readByte();
} else { // Repeat next byte -data+1 times
int16 j = _sceneryArchive2.readByte();
-
+
for (i = 0; i < (byte)(-data + 1); i++, k++)
*tmpImage++ = j;
}
Modified: scummvm/trunk/engines/hugo/hugo.cpp
===================================================================
--- scummvm/trunk/engines/hugo/hugo.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/hugo.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -64,7 +64,7 @@
HugoEngine::HugoEngine(OSystem *syst, const HugoGameDescription *gd) : Engine(syst), _gameDescription(gd), _mouseX(0), _mouseY(0),
_textData(0), _stringtData(0), _screenNames(0), _textEngine(0), _textIntro(0), _textMouse(0), _textParser(0), _textSchedule(0), _textUtil(0),
_arrayNouns(0), _arrayVerbs(0), _arrayReqs(0), _hotspots(0), _invent(0), _uses(0), _catchallList(0), _backgroundObjects(0),
- _points(0), _cmdList(0), _screenActs(0), _actListArr(0), _heroImage(0), _defltTunes(0), _palette(0), _introX(0), _introY(0),
+ _points(0), _cmdList(0), _screenActs(0), _actListArr(0), _heroImage(0), _defltTunes(0), _palette(0), _introX(0), _introY(0),
_maxInvent(0), _numBonuses(0), _numScreens(0), _tunesNbr(0), _soundSilence(0), _soundTest(0), _screenStates(0), _numObj(0),
_score(0), _maxscore(0)
Modified: scummvm/trunk/engines/hugo/hugo.h
===================================================================
--- scummvm/trunk/engines/hugo/hugo.h 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/hugo.h 2010-10-25 13:31:01 UTC (rev 53825)
@@ -190,7 +190,7 @@
return _mouseY;
}
- void boundaryCollision(object_t *obj);
+ void boundaryCollision(object_t *obj);
void clearBoundary(int x1, int x2, int y);
void endGame();
void initStatus();
Modified: scummvm/trunk/engines/hugo/intro_v3d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/intro_v3d.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/intro_v3d.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -69,7 +69,7 @@
_vm->_screen->displayBackground();
g_system->updateScreen();
g_system->delayMillis(5000);
-
+
_vm->_file->readBackground(22); // display screen MAP_3d
_vm->_screen->displayBackground();
introTicks = 0;
Modified: scummvm/trunk/engines/hugo/object.cpp
===================================================================
--- scummvm/trunk/engines/hugo/object.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/object.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -104,9 +104,9 @@
} else {
// Use status.objid on objid
// Default to first cmd verb
- sprintf(_line, "%s %s %s", _vm->_arrayVerbs[_vm->_cmdList[_objects[_vm->getGameStatus().inventoryObjId].cmdIndex][1].verbIndex][0],
- _vm->_arrayNouns[_objects[_vm->getGameStatus().inventoryObjId].nounIndex][0],
- _vm->_arrayNouns[obj->nounIndex][0]);
+ sprintf(_line, "%s %s %s", _vm->_arrayVerbs[_vm->_cmdList[_objects[_vm->getGameStatus().inventoryObjId].cmdIndex][1].verbIndex][0],
+ _vm->_arrayNouns[_objects[_vm->getGameStatus().inventoryObjId].nounIndex][0],
+ _vm->_arrayNouns[obj->nounIndex][0]);
// Check valid use of objects and override verb if necessary
for (uses_t *use = _vm->_uses; use->objId != _vm->_numObj; use++) {
@@ -116,9 +116,9 @@
for (target_t *target = use->targets; _vm->_arrayNouns[target->nounIndex] != 0; target++)
if (_vm->_arrayNouns[target->nounIndex][0] == _vm->_arrayNouns[obj->nounIndex][0]) {
foundFl = true;
- sprintf(_line, "%s %s %s", _vm->_arrayVerbs[target->verbIndex][0],
- _vm->_arrayNouns[_objects[_vm->getGameStatus().inventoryObjId].nounIndex][0],
- _vm->_arrayNouns[obj->nounIndex][0]);
+ sprintf(_line, "%s %s %s", _vm->_arrayVerbs[target->verbIndex][0],
+ _vm->_arrayNouns[_objects[_vm->getGameStatus().inventoryObjId].nounIndex][0],
+ _vm->_arrayNouns[obj->nounIndex][0]);
}
// No valid use of objects found, print failure string
Modified: scummvm/trunk/engines/hugo/object.h
===================================================================
--- scummvm/trunk/engines/hugo/object.h 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/object.h 2010-10-25 13:31:01 UTC (rev 53825)
@@ -63,7 +63,7 @@
void saveSeq(object_t *obj);
void showTakeables();
void useObject(int16 objId);
-
+
static int y2comp(const void *a, const void *b);
bool isCarried(int objIndex) {
@@ -73,7 +73,7 @@
void setCarry(int objIndex, bool val) {
_objects[objIndex].carriedFl = val;
}
-
+
void setVelocity(int objIndex, int8 vx, int8 vy) {
_objects[objIndex].vx = vx;
_objects[objIndex].vy = vy;
Modified: scummvm/trunk/engines/hugo/object_v1d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/object_v1d.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/object_v1d.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -248,7 +248,7 @@
else
obj->currImagePtr = obj->seqList[LEFT].seqPtr;
}
-
+
if (obj->vx || obj->vy)
obj->cycling = CYCLE_FORWARD;
else
Modified: scummvm/trunk/engines/hugo/parser.h
===================================================================
--- scummvm/trunk/engines/hugo/parser.h 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/parser.h 2010-10-25 13:31:01 UTC (rev 53825)
@@ -114,7 +114,7 @@
void lineHandler();
};
-
+
class Parser_v3d : public Parser_v1w {
public:
Parser_v3d(HugoEngine *vm);
Modified: scummvm/trunk/engines/hugo/parser_v3d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/parser_v3d.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/parser_v3d.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -189,7 +189,7 @@
// Nothing matches. Report recognition success to user.
char *verb = findVerb();
char *noun = findNoun();
-
+
if (verb && noun) { // A combination I didn't think of
Utils::Box(BOX_ANY, "%s", _vm->_textParser[kTBNoPoint]);
} else if (noun) {
Modified: scummvm/trunk/engines/hugo/route.cpp
===================================================================
--- scummvm/trunk/engines/hugo/route.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/route.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -309,13 +309,13 @@
_boundaryMap[y][x * 8 + i] = ((_vm->getObjectBoundaryOverlay()[y * XBYTES + x] | _vm->getBoundaryOverlay()[y * XBYTES + x]) & (0x80 >> i)) ? kMapBound : 0;
}
}
-
+
// Clear all object baselines from objbound
for (i = 0, obj = _vm->_object->_objects; i < _vm->_numObj; i++, obj++) {
if ((obj->screenIndex == *_vm->_screen_p) && (obj->cycling != INVISIBLE) && (obj->priority == FLOATING))
_vm->clearBoundary(obj->oldx + obj->currImagePtr->x1, obj->oldx + obj->currImagePtr->x2, obj->oldy + obj->currImagePtr->y2);
}
-
+
// Search from hero to destination
segment(herox1, heroy);
Modified: scummvm/trunk/engines/hugo/schedule.h
===================================================================
--- scummvm/trunk/engines/hugo/schedule.h 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/schedule.h 2010-10-25 13:31:01 UTC (rev 53825)
@@ -79,7 +79,7 @@
event_t *getQueue();
void delQueue(event_t *curEvent);
event_t *doAction(event_t *curEvent);
-
+
virtual const char *getCypher() = 0;
};
Modified: scummvm/trunk/engines/hugo/schedule_v1d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/schedule_v1d.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/schedule_v1d.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -46,7 +46,7 @@
}
const char *Scheduler_v1d::getCypher() {
- return "Copyright 1991, Gray Design Associates";
+ return "Copyright 1991, Gray Design Associates";
}
} // End of namespace Hugo
Modified: scummvm/trunk/engines/hugo/schedule_v3d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/schedule_v3d.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/schedule_v3d.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -46,6 +46,6 @@
}
const char *Scheduler_v3d::getCypher() {
- return "Copyright 1992, Gray Design Associates";
+ return "Copyright 1992, Gray Design Associates";
}
} // End of namespace Hugo
Modified: scummvm/trunk/engines/hugo/sound.cpp
===================================================================
--- scummvm/trunk/engines/hugo/sound.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/sound.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -248,7 +248,7 @@
void SoundHandler::setMusicVolume() {
/* Set the FM music volume from config.mvolume (0..100%) */
-
+
_midiPlayer->setVolume(_config.musicVolume * 255 / 100);
}
@@ -265,7 +265,7 @@
void SoundHandler::toggleMusic() {
// Turn music on and off
_config.musicFl = !_config.musicFl;
-
+
_midiPlayer->pause(_config.musicFl);
}
Modified: scummvm/trunk/engines/hugo/sound.h
===================================================================
--- scummvm/trunk/engines/hugo/sound.h 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/sound.h 2010-10-25 13:31:01 UTC (rev 53825)
@@ -38,7 +38,7 @@
namespace Hugo {
class MidiPlayer;
-
+
class SoundHandler {
public:
SoundHandler(HugoEngine *vm);
Modified: scummvm/trunk/engines/hugo/util.cpp
===================================================================
--- scummvm/trunk/engines/hugo/util.cpp 2010-10-25 13:30:46 UTC (rev 53824)
+++ scummvm/trunk/engines/hugo/util.cpp 2010-10-25 13:31:01 UTC (rev 53825)
@@ -78,14 +78,14 @@
if (*data & maskIn)
result |= maskOut;
}
-
+
*data = result;
}
char *Utils::Box(box_t dismiss, const char *s, ...) {
static char buffer[MAX_STRLEN + 1]; // Format text into this
- if (!s)
+ if (!s)
return 0; // NULL strings catered for
if (s[0] == '\0')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list