[Scummvm-cvs-logs] SF.net SVN: scummvm:[39203] scummvm/trunk/engines
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Mar 7 20:24:32 CET 2009
Revision: 39203
http://scummvm.svn.sourceforge.net/scummvm/?rev=39203&view=rev
Author: fingolfin
Date: 2009-03-07 19:24:31 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Whitespace cleanup: Convert space followed by tab to just tab
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/verb.cpp
scummvm/trunk/engines/gob/detection.cpp
scummvm/trunk/engines/kyra/detection.cpp
scummvm/trunk/engines/kyra/scene_lol.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/m4/burger_data.h
scummvm/trunk/engines/m4/globals.h
scummvm/trunk/engines/m4/script.cpp
scummvm/trunk/engines/m4/ws_machine.cpp
scummvm/trunk/engines/made/detection.cpp
scummvm/trunk/engines/made/redreader.cpp
scummvm/trunk/engines/made/screenfx.cpp
scummvm/trunk/engines/made/script.cpp
scummvm/trunk/engines/made/scriptfuncs.cpp
scummvm/trunk/engines/made/sound.cpp
scummvm/trunk/engines/parallaction/debug.cpp
scummvm/trunk/engines/parallaction/disk_ns.cpp
scummvm/trunk/engines/parallaction/exec.h
scummvm/trunk/engines/parallaction/graphics.h
scummvm/trunk/engines/parallaction/gui_ns.cpp
scummvm/trunk/engines/parallaction/input.cpp
scummvm/trunk/engines/parallaction/input.h
scummvm/trunk/engines/parallaction/inventory.cpp
scummvm/trunk/engines/parallaction/objects.h
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/parser.h
scummvm/trunk/engines/parallaction/walk.cpp
scummvm/trunk/engines/parallaction/walk.h
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/render.cpp
scummvm/trunk/engines/sci/detection.cpp
scummvm/trunk/engines/sci/engine/said.cpp
scummvm/trunk/engines/sci/gfx/operations.cpp
scummvm/trunk/engines/scumm/string.cpp
scummvm/trunk/engines/sword1/animation.cpp
scummvm/trunk/engines/sword1/control.cpp
scummvm/trunk/engines/sword1/screen.cpp
scummvm/trunk/engines/sword2/animation.cpp
scummvm/trunk/engines/tinsel/actors.cpp
scummvm/trunk/engines/tinsel/actors.h
scummvm/trunk/engines/tinsel/background.h
scummvm/trunk/engines/tinsel/bmv.cpp
scummvm/trunk/engines/tinsel/cursor.cpp
scummvm/trunk/engines/tinsel/dialogs.cpp
scummvm/trunk/engines/tinsel/drives.cpp
scummvm/trunk/engines/tinsel/handle.cpp
scummvm/trunk/engines/tinsel/mareels.cpp
scummvm/trunk/engines/tinsel/move.cpp
scummvm/trunk/engines/tinsel/music.cpp
scummvm/trunk/engines/tinsel/pcode.cpp
scummvm/trunk/engines/tinsel/pcode.h
scummvm/trunk/engines/tinsel/pdisplay.cpp
scummvm/trunk/engines/tinsel/play.cpp
scummvm/trunk/engines/tinsel/rince.cpp
scummvm/trunk/engines/tinsel/sched.cpp
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/engines/tinsel/strres.cpp
scummvm/trunk/engines/tinsel/sysvar.cpp
scummvm/trunk/engines/tinsel/timers.cpp
scummvm/trunk/engines/tinsel/tinlib.cpp
scummvm/trunk/engines/tucker/tucker.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/agos/agos.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -357,7 +357,7 @@
HitArea *_lastHitArea3;
Item *_hitAreaSubjectItem;
HitArea *_currentBox, *_currentVerbBox, *_lastVerbOn;
- uint16 _currentBoxNum;
+ uint16 _currentBoxNum;
uint16 _needHitAreaRecalc;
uint16 _verbHitArea;
uint16 _defaultVerb;
Modified: scummvm/trunk/engines/agos/verb.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/agos/verb.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -747,7 +747,7 @@
if (!(best_ha->flags & kBFBoxSelected)) {
hitarea_leave(best_ha, false);
best_ha->flags |= kBFBoxSelected;
- }
+ }
} else {
if (mode == 0)
return;
@@ -762,7 +762,7 @@
hitarea_leave(best_ha, false);
best_ha->flags |= kBFBoxSelected;
}
- }
+ }
}
void AGOSEngine_Waxworks::boxController(uint x, uint y, uint mode) {
Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/gob/detection.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -974,8 +974,8 @@
kFeaturesNone,
"intro"
},
- { // Supplied by kizkoool in bugreport #2089734
- {
+ { // Supplied by kizkoool in bugreport #2089734
+ {
"bargon",
"",
AD_ENTRY1s("intro.stk", "00f6b4e2ee26e5c40b488e2df5adcf03", 3975580),
Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/kyra/detection.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -1082,7 +1082,7 @@
(f == kSupportsListSaves) ||
(f == kSupportsLoadingDuringStartup) ||
(f == kSupportsDeleteSave) ||
- (f == kSavesSupportMetaInfo) ||
+ (f == kSavesSupportMetaInfo) ||
(f == kSavesSupportThumbnail);
}
Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -652,7 +652,7 @@
}
uint16 LoLEngine::calcBlockIndex(uint16 x, uint16 y) {
- return ((y & 0xff00) >> 3) | (x >> 8);
+ return ((y & 0xff00) >> 3) | (x >> 8);
}
void LoLEngine::calcCoordinates(uint16 & x, uint16 & y, int block, uint16 xOffs, uint16 yOffs) {
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -2553,7 +2553,7 @@
}
}
-TownsPC98_OpnSquareSineSource::TownsPC98_OpnSquareSineSource(const uint32 timerbase) : _tlTable(0),
+TownsPC98_OpnSquareSineSource::TownsPC98_OpnSquareSineSource(const uint32 timerbase) : _tlTable(0),
_tleTable(0), _updateRequest(-1), _tickLength(timerbase * 27), _ready(0), _reg(0), _rand(1), _outN(1),
_nTick(0), _evpUpdateCnt(0), _evpTimer(0x1f), _pReslt(0x1f), _attack(0), _cont(false), _evpUpdate(true),
_timer(0), _noiseGenerator(0), _chanEnable(0) {
Modified: scummvm/trunk/engines/m4/burger_data.h
===================================================================
--- scummvm/trunk/engines/m4/burger_data.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/m4/burger_data.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -32,7 +32,7 @@
namespace M4 {
InventoryObject burger_inventory [] = {
- // name scene icon
+ // name scene icon
//-------------------- ----- -----
{ "empty jug", 303, 14 },
{ "distilled juice", 999, 15 },
@@ -41,7 +41,7 @@
{ "broken mouse trap", 999, 18 },
{ "mouse trap", 999, 19 },
{ "kindling", 999, 20 },
- { "burning kindling", 999, 21 },
+ { "burning kindling", 999, 21 },
{ "lights", 508, 22 },
{ "lights on", 508, 23 },
{ "bottle", 999, 24 },
Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/m4/globals.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -79,12 +79,12 @@
kGlobTemp32 = 38
};
-const uint32 SERIES_FORWARD = 0;
-const uint32 SERIES_PINGPONG = 1;
-const uint32 SERIES_BACKWARD = 2;
-const uint32 SERIES_RANDOM = 4;
-const uint32 SERIES_NO_TOSS = 8;
-const uint32 SERIES_STICK = 16;
+const uint32 SERIES_FORWARD = 0;
+const uint32 SERIES_PINGPONG = 1;
+const uint32 SERIES_BACKWARD = 2;
+const uint32 SERIES_RANDOM = 4;
+const uint32 SERIES_NO_TOSS = 8;
+const uint32 SERIES_STICK = 16;
const uint32 SERIES_LOOP_TRIGGER = 32;
const uint32 SERIES_LOAD_PALETTE = 64;
const uint32 SERIES_HORZ_FLIP =128;
Modified: scummvm/trunk/engines/m4/script.cpp
===================================================================
--- scummvm/trunk/engines/m4/script.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/m4/script.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -556,7 +556,7 @@
int args = (this->*(_kernelFunctions[index].proc))();
// Now remove values from the stack if the function used any
- if (args > 4)
+ if (args > 4)
_stackPtr -= args - 4;
printf("-------------\n");
Modified: scummvm/trunk/engines/m4/ws_machine.cpp
===================================================================
--- scummvm/trunk/engines/m4/ws_machine.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/m4/ws_machine.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -34,16 +34,16 @@
&Machine::m1_jump,
&Machine::m1_terminate,
&Machine::m1_startSequence,
- &Machine::m1_pauseSequence,
- &Machine::m1_resumeSequence,
- &Machine::m1_storeValue,
- &Machine::m1_sendMessage,
- &Machine::m1_broadcastMessage,
- &Machine::m1_replyMessage,
- &Machine::m1_sendSystemMessage,
- &Machine::m1_createMachine,
- &Machine::m1_createMachineEx,
- &Machine::m1_clearVars
+ &Machine::m1_pauseSequence,
+ &Machine::m1_resumeSequence,
+ &Machine::m1_storeValue,
+ &Machine::m1_sendMessage,
+ &Machine::m1_broadcastMessage,
+ &Machine::m1_replyMessage,
+ &Machine::m1_sendSystemMessage,
+ &Machine::m1_createMachine,
+ &Machine::m1_createMachineEx,
+ &Machine::m1_clearVars
};
void (Machine::*machineConditionalsTable[])(Instruction &instruction) = {
Modified: scummvm/trunk/engines/made/detection.cpp
===================================================================
--- scummvm/trunk/engines/made/detection.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/made/detection.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -275,7 +275,7 @@
0,
GF_FLOPPY,
1,
- },
+ },
{
// Leather Goddesses of Phobos 2
Modified: scummvm/trunk/engines/made/redreader.cpp
===================================================================
--- scummvm/trunk/engines/made/redreader.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/made/redreader.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -366,7 +366,7 @@
k = heap[i];
while ((j = 2 * i) <= heapsize) {
if (j < heapsize && freq[heap[j]] > freq[heap[j + 1]])
- j++;
+ j++;
if (freq[k] <= freq[heap[j]]) break;
heap[i] = heap[j]; i = j;
}
Modified: scummvm/trunk/engines/made/screenfx.cpp
===================================================================
--- scummvm/trunk/engines/made/screenfx.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/made/screenfx.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -161,7 +161,7 @@
_screen->setRGBPalette(_fxPalette, 0, colorCount);
_screen->updateScreenAndWait(20);
_screen->setRGBPalette(palette, 0, colorCount);
- _screen->updateScreenAndWait(20);
+ _screen->updateScreenAndWait(20);
}
}
@@ -309,7 +309,7 @@
setBlendedPalette(palette, newPalette, colorCount, x, 312);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
void ScreenEffects::vfx02(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -318,7 +318,7 @@
setBlendedPalette(palette, newPalette, colorCount, 312 - x, 312);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
void ScreenEffects::vfx03(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -327,7 +327,7 @@
setBlendedPalette(palette, newPalette, colorCount, y, 190);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
void ScreenEffects::vfx04(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -336,7 +336,7 @@
setBlendedPalette(palette, newPalette, colorCount, 190 - y, 190);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
void ScreenEffects::vfx05(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -346,7 +346,7 @@
setBlendedPalette(palette, newPalette, colorCount, y, 90);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
void ScreenEffects::vfx06(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -356,7 +356,7 @@
setBlendedPalette(palette, newPalette, colorCount, x, 152);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
void ScreenEffects::vfx07(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -366,7 +366,7 @@
setBlendedPalette(palette, newPalette, colorCount, 152 - x, 152);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
// "Screen slide in" right to left
@@ -443,7 +443,7 @@
setBlendedPalette(palette, newPalette, colorCount, i, 27);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
void ScreenEffects::vfx15(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -454,7 +454,7 @@
setBlendedPalette(palette, newPalette, colorCount, i, 27);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
void ScreenEffects::vfx16(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -465,7 +465,7 @@
setBlendedPalette(palette, newPalette, colorCount, i, 27);
_screen->updateScreenAndWait(25);
}
- setPalette(palette);
+ setPalette(palette);
}
// Palette fadeout/fadein
Modified: scummvm/trunk/engines/made/script.cpp
===================================================================
--- scummvm/trunk/engines/made/script.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/made/script.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -585,9 +585,9 @@
_stack.push(_codeIp - _codeBase);
_stack.push(_runningScriptObjectIndex);
_stack.push(kScriptStackLimit - _localStackPos);
- _localStackPos = _stack.getStackPos();
+ _localStackPos = _stack.getStackPos();
- int16 propertyId = _stack.peek(_localStackPos + argc + 2);
+ int16 propertyId = _stack.peek(_localStackPos + argc + 2);
int16 objectIndex = _stack.peek(_localStackPos + argc + 4);
debug(4, "objectIndex = %d (%04X); propertyId = %d(%04X)", objectIndex, objectIndex, propertyId, propertyId);
@@ -708,25 +708,25 @@
switch (*sig) {
case 'b':
valueType = 0;
- value = *code++;
+ value = *code++;
break;
case 'B':
- valueType = 1;
- value = *code++;
+ valueType = 1;
+ value = *code++;
break;
case 'w':
valueType = 0;
- value = READ_LE_UINT16(code);
- code += 2;
+ value = READ_LE_UINT16(code);
+ code += 2;
break;
case 'W':
- valueType = 1;
- value = READ_LE_UINT16(code);
- code += 2;
+ valueType = 1;
+ value = READ_LE_UINT16(code);
+ code += 2;
break;
case 'E':
- valueType = 2;
- value = *code++;
+ valueType = 2;
+ value = *code++;
break;
}
switch (valueType) {
@@ -742,7 +742,7 @@
externStats[value]++;
} else {
snprintf(tempStr, 32, "invalid: %d", value);
- }
+ }
break;
}
codeLine += tempStr;
Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -190,7 +190,7 @@
_vm->_mixer->stopHandle(_audioStreamHandle);
_vm->_autoStopSound = false;
}
- _vm->_screen->clearScreen();
+ _vm->_screen->clearScreen();
return 0;
}
Modified: scummvm/trunk/engines/made/sound.cpp
===================================================================
--- scummvm/trunk/engines/made/sound.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/made/sound.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -42,11 +42,11 @@
_writeFlag = false;
_eof = false;
_sample1 = 0x80000;
- _sample2 = 0x800000;
- _sample3 = 0x800000;
- _sample4 = 0x800000;
- _mode = getBit();
- while (!_eof) {
+ _sample2 = 0x800000;
+ _sample3 = 0x800000;
+ _sample4 = 0x800000;
+ _mode = getBit();
+ while (!_eof) {
update1();
update3();
update0();
@@ -233,7 +233,7 @@
break;
default:
- return;
+ return;
}
Modified: scummvm/trunk/engines/parallaction/debug.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/debug.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/debug.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -45,7 +45,7 @@
DCmd_Register("localflags", WRAP_METHOD(Debugger, Cmd_LocalFlags));
DCmd_Register("locations", WRAP_METHOD(Debugger, Cmd_Locations));
DCmd_Register("gfxobjects", WRAP_METHOD(Debugger, Cmd_GfxObjects));
- DCmd_Register("programs", WRAP_METHOD(Debugger, Cmd_Programs));
+ DCmd_Register("programs", WRAP_METHOD(Debugger, Cmd_Programs));
}
Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -72,7 +72,7 @@
uint32 _archiveOffsets[MAX_ARCHIVE_ENTRIES];
uint32 _numFiles;
- uint32 lookup(const char *name) const;
+ uint32 lookup(const char *name) const;
public:
NSArchive(Common::SeekableReadStream *stream, Common::Platform platform, uint32 features);
@@ -90,27 +90,27 @@
error("NSArchive: invalid stream passed to constructor");
}
- bool isSmallArchive = false;
+ bool isSmallArchive = false;
if (platform == Common::kPlatformAmiga) {
if (features & GF_DEMO) {
- isSmallArchive = stream->size() == SIZEOF_SMALL_ARCHIVE;
+ isSmallArchive = stream->size() == SIZEOF_SMALL_ARCHIVE;
} else if (features & GF_LANG_MULT) {
- isSmallArchive = (stream->readUint32BE() != MKID_BE('NDOS'));
- }
- }
+ isSmallArchive = (stream->readUint32BE() != MKID_BE('NDOS'));
+ }
+ }
- _numFiles = (isSmallArchive) ? SMALL_ARCHIVE_FILES_NUM : NORMAL_ARCHIVE_FILES_NUM;
+ _numFiles = (isSmallArchive) ? SMALL_ARCHIVE_FILES_NUM : NORMAL_ARCHIVE_FILES_NUM;
_stream->seek(ARCHIVE_FILENAMES_OFS);
_stream->read(_archiveDir, _numFiles*32);
_stream->seek((isSmallArchive) ? SMALL_ARCHIVE_SIZES_OFS : NORMAL_ARCHIVE_SIZES_OFS);
- uint32 dataOffset = (isSmallArchive) ? SMALL_ARCHIVE_DATA_OFS : NORMAL_ARCHIVE_DATA_OFS;
- for (uint16 i = 0; i < _numFiles; i++) {
- _archiveOffsets[i] = dataOffset;
+ uint32 dataOffset = (isSmallArchive) ? SMALL_ARCHIVE_DATA_OFS : NORMAL_ARCHIVE_DATA_OFS;
+ for (uint16 i = 0; i < _numFiles; i++) {
+ _archiveOffsets[i] = dataOffset;
_archiveLenghts[i] = _stream->readUint32BE();
- dataOffset += _archiveLenghts[i];
+ dataOffset += _archiveLenghts[i];
}
}
@@ -121,9 +121,9 @@
uint32 NSArchive::lookup(const char *name) const {
uint32 i = 0;
- for ( ; i < _numFiles; i++) {
+ for ( ; i < _numFiles; i++) {
if (!scumm_stricmp(_archiveDir[i], name)) break;
- }
+ }
return i;
}
Modified: scummvm/trunk/engines/parallaction/exec.h
===================================================================
--- scummvm/trunk/engines/parallaction/exec.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/exec.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -238,7 +238,7 @@
DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(call);
DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript);
DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(on);
- DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off);
+ DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off);
DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(inc);
DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(dec);
DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(set);
Modified: scummvm/trunk/engines/parallaction/graphics.h
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/graphics.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -131,7 +131,7 @@
uint16 _height; //
byte** field_8; // unused
byte* _data;
- bool _freeData;
+ bool _freeData;
public:
Cnv() {
@@ -343,12 +343,12 @@
struct BackgroundInfo {
protected:
typedef Common::Array<MaskBuffer*> MaskPatches;
- MaskPatches _maskPatches;
+ MaskPatches _maskPatches;
MaskBuffer _maskBackup;
void clearMaskData();
typedef Common::Array<PathBuffer*> PathPatches;
- PathPatches _pathPatches;
+ PathPatches _pathPatches;
PathBuffer _pathBackup;
void clearPathData();
@@ -363,7 +363,7 @@
Palette palette;
- int layers[4];
+ int layers[4];
PaletteFxRange ranges[6];
@@ -505,12 +505,12 @@
Graphics::Surface *lockScreen();
void unlockScreen();
- void updateScreenIntern();
+ void updateScreenIntern();
bool _doubleBuffering;
int _gameType;
Graphics::Surface _backBuffer;
- void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
+ void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
int _scrollPos;
int _minScroll, _maxScroll;
@@ -526,7 +526,7 @@
// overlay mode enables drawing of graphics with automatic screen-to-game coordinate translation
bool _overlayMode;
void drawOverlay(Graphics::Surface &surf);
- void drawInventory();
+ void drawInventory();
void drawList(Graphics::Surface &surface, GfxObjArray &list);
void updateFloatingLabel();
Modified: scummvm/trunk/engines/parallaction/gui_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gui_ns.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/gui_ns.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -397,7 +397,7 @@
}
byte _points[3];
- bool _fail;
+ bool _fail;
const uint16 (*_keys)[PASSWORD_LEN];
Graphics::Surface _block;
Graphics::Surface _emptySlots;
Modified: scummvm/trunk/engines/parallaction/input.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/input.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/input.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -304,9 +304,9 @@
}
trackMouse(z);
- if (!z) {
- return true;
- }
+ if (!z) {
+ return true;
+ }
if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || (ACTIONTYPE(z) == kZoneCommand))) {
Modified: scummvm/trunk/engines/parallaction/input.h
===================================================================
--- scummvm/trunk/engines/parallaction/input.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/input.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -48,7 +48,7 @@
};
class Input {
- int updateGameInput();
+ int updateGameInput();
bool _hasKeyPressEvent;
Common::KeyState _keyPressed;
@@ -61,8 +61,8 @@
void translateInput();
bool translateGameInput();
bool updateInventoryInput();
- void takeAction(ZonePtr z);
- void walkTo(const Common::Point &dest);
+ void takeAction(ZonePtr z);
+ void walkTo(const Common::Point &dest);
Parallaction *_vm;
@@ -72,7 +72,7 @@
ZonePtr _hoverZone;
void enterInventoryMode();
- void exitInventoryMode();
+ void exitInventoryMode();
int _gameType;
@@ -112,11 +112,11 @@
InventoryItem _activeItem;
void readInput();
- int updateInput();
+ int updateInput();
void trackMouse(ZonePtr z);
void waitForButtonEvent(uint32 buttonEventMask, int32 timeout = -1);
uint32 getLastButtonEvent() { return _mouseButtons; }
- bool getLastKeyDown(uint16 &ascii);
+ bool getLastKeyDown(uint16 &ascii);
void stopHovering();
Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/inventory.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -62,24 +62,24 @@
};
InventoryProperties _invProps_NS = {
- 32, // INVENTORYITEM_PITCH
- 24, // INVENTORYITEM_WIDTH
- 24, // INVENTORYITEM_HEIGHT
- 30, // INVENTORY_MAX_ITEMS
- 5, // INVENTORY_ITEMS_PER_LINE
- 6, // INVENTORY_LINES
- 5 * 24, // INVENTORY_WIDTH =(INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
+ 32, // INVENTORYITEM_PITCH
+ 24, // INVENTORYITEM_WIDTH
+ 24, // INVENTORYITEM_HEIGHT
+ 30, // INVENTORY_MAX_ITEMS
+ 5, // INVENTORY_ITEMS_PER_LINE
+ 6, // INVENTORY_LINES
+ 5 * 24, // INVENTORY_WIDTH =(INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
6 * 24 // INVENTORY_HEIGHT = (INVENTORY_LINES*INVENTORYITEM_HEIGHT)
};
InventoryProperties _invProps_BR = {
- 51, // INVENTORYITEM_PITCH
- 51, // INVENTORYITEM_WIDTH
- 51, // INVENTORYITEM_HEIGHT
- 48, // INVENTORY_MAX_ITEMS
- 6, // INVENTORY_ITEMS_PER_LINE
- 8, // INVENTORY_LINES
- 6 * 51, // INVENTORY_WIDTH =(INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
+ 51, // INVENTORYITEM_PITCH
+ 51, // INVENTORYITEM_WIDTH
+ 51, // INVENTORYITEM_HEIGHT
+ 48, // INVENTORY_MAX_ITEMS
+ 6, // INVENTORY_ITEMS_PER_LINE
+ 8, // INVENTORY_LINES
+ 6 * 51, // INVENTORY_WIDTH =(INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
8 * 51 // INVENTORY_HEIGHT = (INVENTORY_LINES*INVENTORYITEM_HEIGHT)
};
Modified: scummvm/trunk/engines/parallaction/objects.h
===================================================================
--- scummvm/trunk/engines/parallaction/objects.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/objects.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -346,10 +346,10 @@
// getters/setters
- virtual int16 getX() { return _left; }
+ virtual int16 getX() { return _left; }
virtual void setX(int16 value) { _left = value; }
- virtual int16 getY() { return _top; }
+ virtual int16 getY() { return _top; }
virtual void setY(int16 value) { _top = value; }
};
@@ -533,16 +533,16 @@
void forceXYZF(int16 x, int16 y, int16 z, int16 f);
// getters/setters used by scripts
- int16 getX() { return _left; }
+ int16 getX() { return _left; }
void setX(int16 value) { _left = value; }
- int16 getY() { return _top; }
+ int16 getY() { return _top; }
void setY(int16 value) { _top = value; }
- int16 getZ() { return _z; }
+ int16 getZ() { return _z; }
void setZ(int16 value) { _z = value; }
- int16 getF() { return _frame; }
+ int16 getF() { return _frame; }
void setF(int16 value);
void getFoot(Common::Point &foot);
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -293,10 +293,10 @@
Table *_localFlagNames;
CommandExec *_cmdExec;
ProgramExec *_programExec;
- Inventory *_inventory;
- BalloonManager *_balloonMan;
+ Inventory *_inventory;
+ BalloonManager *_balloonMan;
DialogueManager *_dialogueMan;
- InventoryRenderer *_inventoryRenderer;
+ InventoryRenderer *_inventoryRenderer;
// game data
Character _char;
@@ -313,31 +313,31 @@
protected:
void runGame();
- void runGameFrame(int event);
- void runGuiFrame();
- void cleanupGui();
- void runDialogueFrame();
- void exitDialogueMode();
- void runCommentFrame();
- void enterCommentMode(ZonePtr z);
- void exitCommentMode();
+ void runGameFrame(int event);
+ void runGuiFrame();
+ void cleanupGui();
+ void runDialogueFrame();
+ void exitDialogueMode();
+ void runCommentFrame();
+ void enterCommentMode(ZonePtr z);
+ void exitCommentMode();
void updateView();
- void drawAnimation(AnimationPtr anim);
- void drawZone(ZonePtr zone);
+ void drawAnimation(AnimationPtr anim);
+ void drawZone(ZonePtr zone);
void updateZones();
void doLocationEnterTransition();
void allocateLocationSlot(const char *name);
void finalizeLocationParsing();
void showLocationComment(const Common::String &text, bool end);
- void setupBalloonManager();
+ void setupBalloonManager();
public:
void beep();
void pauseJobs();
void resumeJobs();
- uint getInternLanguage();
- void setInternLanguage(uint id);
- void enterDialogueMode(ZonePtr z);
+ uint getInternLanguage();
+ void setInternLanguage(uint id);
+ void enterDialogueMode(ZonePtr z);
void scheduleLocationSwitch(const char *location);
void showSlide(const char *name, int x = 0, int y = 0);
@@ -346,28 +346,28 @@
void clearLocationFlags(uint32 flags);
void toggleLocationFlags(uint32 flags);
uint32 getLocationFlags();
- bool checkSpecialZoneBox(ZonePtr z, uint32 type, uint x, uint y);
- bool checkZoneBox(ZonePtr z, uint32 type, uint x, uint y);
- bool checkLinkedAnimBox(ZonePtr z, uint32 type, uint x, uint y);
+ bool checkSpecialZoneBox(ZonePtr z, uint32 type, uint x, uint y);
+ bool checkZoneBox(ZonePtr z, uint32 type, uint x, uint y);
+ bool checkLinkedAnimBox(ZonePtr z, uint32 type, uint x, uint y);
ZonePtr hitZone(uint32 type, uint16 x, uint16 y);
void runZone(ZonePtr z);
bool pickupItem(ZonePtr z);
- void updateDoor(ZonePtr z, bool close);
- void showZone(ZonePtr z, bool visible);
+ void updateDoor(ZonePtr z, bool close);
+ void showZone(ZonePtr z, bool visible);
void setBackground(const char *background, const char *mask, const char *path);
- void highlightInventoryItem(ItemPosition pos);
- int16 getHoverInventoryItem(int16 x, int16 y);
- int addInventoryItem(ItemName item);
- int addInventoryItem(ItemName item, uint32 value);
- void dropItem(uint16 v);
- bool isItemInInventory(int32 v);
- const InventoryItem* getInventoryItem(int16 pos);
- int16 getInventoryItemIndex(int16 pos);
- void initInventory();
- void destroyInventory();
- void cleanInventory(bool keepVerbs = true);
- void openInventory();
- void closeInventory();
+ void highlightInventoryItem(ItemPosition pos);
+ int16 getHoverInventoryItem(int16 x, int16 y);
+ int addInventoryItem(ItemName item);
+ int addInventoryItem(ItemName item, uint32 value);
+ void dropItem(uint16 v);
+ bool isItemInInventory(int32 v);
+ const InventoryItem* getInventoryItem(int16 pos);
+ int16 getInventoryItemIndex(int16 pos);
+ void initInventory();
+ void destroyInventory();
+ void cleanInventory(bool keepVerbs = true);
+ void openInventory();
+ void closeInventory();
virtual void parseLocation(const char* name) = 0;
virtual void changeLocation() = 0;
@@ -404,7 +404,7 @@
virtual DialogueManager *createDialogueManager(ZonePtr z);
- void switchBackground(const char* background, const char* mask);
+ void switchBackground(const char* background, const char* mask);
private:
bool _inTestResult;
@@ -412,17 +412,17 @@
ProgramParser_ns *_programParser;
private:
- void initFonts();
- void freeFonts();
- void initResources();
+ void initFonts();
+ void freeFonts();
+ void initResources();
void startGui();
void startCreditSequence();
void startEndPartSequence();
void loadProgram(AnimationPtr a, const char *filename);
void freeLocation(bool removeAll);
- void freeCharacter();
- void startMovingSarcophagus(ZonePtr sarc);
- void stopMovingSarcophagus();
+ void freeCharacter();
+ void startMovingSarcophagus(ZonePtr sarc);
+ void stopMovingSarcophagus();
// callables data
@@ -539,9 +539,9 @@
void initFonts();
void freeFonts();
void freeLocation(bool removeAll);
- void loadProgram(AnimationPtr a, const char *filename);
- void startGui(bool showSplash);
- void freeCharacter();
+ void loadProgram(AnimationPtr a, const char *filename);
+ void startGui(bool showSplash);
+ void freeCharacter();
typedef void (Parallaction_br::*Callable)(void*);
const Callable *_callables;
Modified: scummvm/trunk/engines/parallaction/parser.h
===================================================================
--- scummvm/trunk/engines/parallaction/parser.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/parser.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -190,8 +190,8 @@
Dialogue *parseDialogue();
void resolveDialogueForwards(Dialogue *dialogue, uint numQuestions, Table &forwards);
virtual Answer *parseAnswer();
- void parseAnswerFlags(Answer *answer);
- void parseAnswerBody(Answer *answer);
+ void parseAnswerFlags(Answer *answer);
+ void parseAnswerBody(Answer *answer);
Question *parseQuestion();
void parseZone(ZoneList &list, char *name);
@@ -200,9 +200,9 @@
void parseAnimation(AnimationList &list, char *name);
void parseCommands(CommandList&);
void parseCommandFlags();
- void parseCommandFlag(CommandPtr cmd, const char *flag, Table *table, bool checkTrap);
- void saveCommandForward(const char *name, CommandPtr cmd);
- void resolveCommandForwards();
+ void parseCommandFlag(CommandPtr cmd, const char *flag, Table *table, bool checkTrap);
+ void saveCommandForward(const char *name, CommandPtr cmd);
+ void resolveCommandForwards();
void createCommand(uint id);
void addCommand();
@@ -307,9 +307,9 @@
virtual void parseZoneTypeBlock(ZonePtr z);
void parsePathData(ZonePtr z);
- void parseGetData(ZonePtr z);
- void parseDoorData(ZonePtr z);
- void parseAnswerCounter(Answer *answer);
+ void parseGetData(ZonePtr z);
+ void parseDoorData(ZonePtr z);
+ void parseAnswerCounter(Answer *answer);
virtual Answer *parseAnswer();
public:
Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/walk.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -520,7 +520,7 @@
// TODO: Input::walkTo must be extended to support destination frame in addition to coordinates
if (_engineFlags & FINAL_WALK_FRAME) { // this flag is set in readInput()
_engineFlags &= ~FINAL_WALK_FRAME;
- _ch._a->_frame = _moveToF; // from readInput()...
+ _ch._a->_frame = _moveToF; // from readInput()...
} else {
_ch._a->_frame = _dirFrame; // from walk()
}
Modified: scummvm/trunk/engines/parallaction/walk.h
===================================================================
--- scummvm/trunk/engines/parallaction/walk.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/parallaction/walk.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -69,7 +69,7 @@
AnimationPtr _a;
int _walkDelay;
int _fieldC;
- Common::Point _startFoot;
+ Common::Point _startFoot;
bool _first;
int _step;
int _dirFrame;
Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/saga/interface.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -2186,10 +2186,10 @@
_vm->_gfx->setPixelColor(x, ye, cornerColor);
_vm->_gfx->setPixelColor(xe, y, cornerColor);
_vm->_gfx->setPixelColor(xe, ye, cornerColor);
- _vm->_gfx->hLine(x + 1, y, x + w - 2, frameColor);
- _vm->_gfx->hLine(x + 1, ye, x + w - 2, frameColor);
- _vm->_gfx->vLine(x, y + 1, y + h - 2, frameColor);
- _vm->_gfx->vLine(xe, y + 1, y + h - 2, frameColor);
+ _vm->_gfx->hLine(x + 1, y, x + w - 2, frameColor);
+ _vm->_gfx->hLine(x + 1, ye, x + w - 2, frameColor);
+ _vm->_gfx->vLine(x, y + 1, y + h - 2, frameColor);
+ _vm->_gfx->vLine(xe, y + 1, y + h - 2, frameColor);
x++;
y++;
Modified: scummvm/trunk/engines/saga/render.cpp
===================================================================
--- scummvm/trunk/engines/saga/render.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/saga/render.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -220,8 +220,8 @@
if (x2 > x1 && y2 > y1) {
Common::Rect rectClipped(x1, y1, x2, y2);
// Check if the new rectangle is contained within another in the list
- Common::List<Common::Rect>::const_iterator it;
- for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
+ Common::List<Common::Rect>::const_iterator it;
+ for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
if (it->contains(rectClipped))
return;
if (rectClipped.contains(*it)) {
@@ -236,8 +236,8 @@
void Render::restoreChangedRects() {
if (!_fullRefresh) {
- Common::List<Common::Rect>::const_iterator it;
- for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
+ Common::List<Common::Rect>::const_iterator it;
+ for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
//_backGroundSurface.frameRect(*it, 1); // DEBUG
if (_vm->_interface->getFadeMode() != kFadeOut)
g_system->copyRectToScreen(_vm->_gfx->getBackBufferPixels(), _backGroundSurface.w, it->left, it->top, it->width(), it->height());
@@ -248,8 +248,8 @@
void Render::drawDirtyRects() {
if (!_fullRefresh) {
- Common::List<Common::Rect>::const_iterator it;
- for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
+ Common::List<Common::Rect>::const_iterator it;
+ for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
//_backGroundSurface.frameRect(*it, 2); // DEBUG
if (_vm->_interface->getFadeMode() != kFadeOut)
g_system->copyRectToScreen(_vm->_gfx->getBackBufferPixels(), _backGroundSurface.w, it->left, it->top, it->width(), it->height());
Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/sci/detection.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -308,14 +308,14 @@
},
{{"longbow", "", {
- {"resource.002", 0, "7f6ce331219d58d5087731e4475ab4f1", 1128555},
- {"resource.003", 0, "21ebe6b39b57a73fc449f67f013765aa", 972635},
- {"resource.000", 0, "36e8fda5d0b8c49e587c8a9617959f72", 1096767},
- {"resource.001", 0, "d4c299213f8d799da1492680d12d0fb3", 1133226},
- {"resource.map", 0, "36d3b81ff75b67dd4d27b7f5d3166503", 6261},
- {"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1064637},
- {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950},
- {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966},
+ {"resource.002", 0, "7f6ce331219d58d5087731e4475ab4f1", 1128555},
+ {"resource.003", 0, "21ebe6b39b57a73fc449f67f013765aa", 972635},
+ {"resource.000", 0, "36e8fda5d0b8c49e587c8a9617959f72", 1096767},
+ {"resource.001", 0, "d4c299213f8d799da1492680d12d0fb3", 1133226},
+ {"resource.map", 0, "36d3b81ff75b67dd4d27b7f5d3166503", 6261},
+ {"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1064637},
+ {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950},
+ {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
{},
SCI_VERSION_AUTODETECT,
Modified: scummvm/trunk/engines/sci/engine/said.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/said.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/sci/engine/said.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -899,7 +899,7 @@
fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
- );
+ );
fprintf (stderr, "\n");
}
}
Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -1496,17 +1496,17 @@
// We add the modifier key status to buckybits
// SDL sends a keydown event if a modifier key is turned on and a keyup event if it's off
//
- // FIXME: This code is semi-bogus. It only records the modifier key being *pressed*.
- // It does not track correctly whether capslock etc. is active. To do that, we
- // would have to record the fact that the modifier was pressed in global var,
- // and also watch for Common::EVENT_KEYUP events.
- // But this is still not quite good enough, because not all events might
- // pass through here (e.g. the GUI might be running with its own event loop).
- //
- // The best solution likely would be to add code to the EventManager class
- // for tracking which keys are pressed and which are not...
+ // FIXME: This code is semi-bogus. It only records the modifier key being *pressed*.
+ // It does not track correctly whether capslock etc. is active. To do that, we
+ // would have to record the fact that the modifier was pressed in global var,
+ // and also watch for Common::EVENT_KEYUP events.
+ // But this is still not quite good enough, because not all events might
+ // pass through here (e.g. the GUI might be running with its own event loop).
+ //
+ // The best solution likely would be to add code to the EventManager class
+ // for tracking which keys are pressed and which are not...
if (ev.type == Common::EVENT_KEYDOWN || ev.type == Common::EVENT_KEYUP) {
- switch (ev.kbd.keycode) {
+ switch (ev.kbd.keycode) {
case Common::KEYCODE_CAPSLOCK:
if (ev.type == Common::EVENT_KEYDOWN) {
_modifierStates |= SCI_EVM_CAPSLOCK;
Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/scumm/string.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -174,7 +174,7 @@
// Some localizations may override colors
// See credits in Chinese COMI
- if (_game.id == GID_CMI && _language == Common::ZH_TWN &&
+ if (_game.id == GID_CMI && _language == Common::ZH_TWN &&
c == '^' && (buf == _blastTextQueue[i].text + 1)) {
if (*buf == 'c') {
int color = buf[3] - '0' + 10 *(buf[2] - '0');
Modified: scummvm/trunk/engines/sword1/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword1/animation.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/sword1/animation.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -272,8 +272,8 @@
DXAPlayerWithSound *dxaDecoder = new DXAPlayerWithSound(snd, bgSoundHandle);
return new MoviePlayer(vm, textMan, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA);
#else
- GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK");
- dialog.runModal();
+ GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK");
+ dialog.runModal();
return NULL;
#endif
}
@@ -282,14 +282,14 @@
snprintf(filename, sizeof(filename), "%s.mp2", sequenceList[id]);
if (Common::File::exists(filename)) {
- GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK");
- dialog.runModal();
+ GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK");
+ dialog.runModal();
return NULL;
}
sprintf(buf, "Cutscene '%s' not found", sequenceList[id]);
- GUI::MessageDialog dialog(buf, "OK");
- dialog.runModal();
+ GUI::MessageDialog dialog(buf, "OK");
+ dialog.runModal();
return NULL;
}
Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/sword1/control.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -1181,7 +1181,7 @@
inf->readUint16BE(); // save time
if (saveVersion < 2) { // Before version 2 we didn't had play time feature
- SwordEngine::_systemVars.engineStartTime = _system->getMillis() / 1000; // Start counting
+ SwordEngine::_systemVars.engineStartTime = _system->getMillis() / 1000; // Start counting
} else {
uint32 currentTime = _system->getMillis() / 1000;
SwordEngine::_systemVars.engineStartTime = currentTime - inf->readUint32BE(); // Engine start time
Modified: scummvm/trunk/engines/sword1/screen.cpp
===================================================================
--- scummvm/trunk/engines/sword1/screen.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/sword1/screen.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -385,7 +385,7 @@
} else if (!(SwordEngine::isPsx())) {
memcpy(_screenBuf, _layerBlocks[0], _scrnSizeX * _scrnSizeY);
} else { //We are using PSX version
- uint8 *indxScreen;
+ uint8 *indxScreen;
if(_currentScreen == 45 || _currentScreen == 55 ||
_currentScreen == 57 || _currentScreen == 63 || _currentScreen == 71) // Width shrinked backgrounds
indxScreen = psxShrinkedBackgroundToIndexed(_layerBlocks[0], _scrnSizeX, _scrnSizeY);
Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/sword2/animation.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -334,8 +334,8 @@
DXAPlayerWithSound *dxaDecoder = new DXAPlayerWithSound(snd, bgSoundHandle);
return new MoviePlayer(vm, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA);
#else
- GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK");
- dialog.runModal();
+ GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK");
+ dialog.runModal();
return NULL;
#endif
}
@@ -344,8 +344,8 @@
snprintf(filename, sizeof(filename), "%s.mp2", name);
if (Common::File::exists(filename)) {
- GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK");
- dialog.runModal();
+ GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK");
+ dialog.runModal();
return NULL;
}
@@ -353,8 +353,8 @@
// those warnings more discreet.
if (!vm->_logic->readVar(DEMO)) {
sprintf(buf, "Cutscene '%s' not found", name);
- GUI::MessageDialog dialog(buf, "OK");
- dialog.runModal();
+ GUI::MessageDialog dialog(buf, "OK");
+ dialog.runModal();
} else
warning("Cutscene '%s' not found", name);
Modified: scummvm/trunk/engines/tinsel/actors.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/actors.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/actors.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -95,7 +95,7 @@
const FREEL *presReel; // the present reel
int presRnum; // the present reel number
- SCNHANDLE presFilm; // the film that reel belongs to
+ SCNHANDLE presFilm; // the film that reel belongs to
OBJECT *presObj; // reference for position information
int presPlayX, presPlayY;
@@ -108,9 +108,9 @@
COLORREF textColour; // Text colour
- SCNHANDLE playFilm; // revert to this after talks
- SCNHANDLE talkFilm; // this be deleted in the future!
- SCNHANDLE latestFilm; // the last film ordered
+ SCNHANDLE playFilm; // revert to this after talks
+ SCNHANDLE talkFilm; // this be deleted in the future!
+ SCNHANDLE latestFilm; // the last film ordered
bool bTalking;
int steps;
@@ -162,7 +162,7 @@
* @param num Chunk Id
*/
void RegisterActors(int num) {
- if (actorInfo == NULL) {
+ if (actorInfo == NULL) {
// Store the total number of actors in the game
NumActors = num;
Modified: scummvm/trunk/engines/tinsel/actors.h
===================================================================
--- scummvm/trunk/engines/tinsel/actors.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/actors.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -147,7 +147,7 @@
short zFactor;
bool bAlive;
bool bHidden;
- SCNHANDLE presFilm; //!< the film that reel belongs to
+ SCNHANDLE presFilm; //!< the film that reel belongs to
short presRnum; //!< the present reel number
short presPlayX, presPlayY;
};
Modified: scummvm/trunk/engines/tinsel/background.h
===================================================================
--- scummvm/trunk/engines/tinsel/background.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/background.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -93,7 +93,7 @@
int *pXpos, // returns current x position
int *pYpos); // returns current y position
-int PlayfieldGetCentreX( // Returns the xy position of the specified playfield in the current background
+int PlayfieldGetCentreX( // Returns the xy position of the specified playfield in the current background
int which); // which playfield
OBJECT *GetPlayfieldList( // Returns the display list for the specified playfield
Modified: scummvm/trunk/engines/tinsel/bmv.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/bmv.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/bmv.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -97,8 +97,8 @@
#define BIT0 0x01
#define CD_XSCR 0x04 // Screen has a scroll offset
-#define CD_CMAP 0x08 // Colour map is included
-#define CD_CMND 0x10 // Command is included
+#define CD_CMAP 0x08 // Colour map is included
+#define CD_CMND 0x10 // Command is included
#define CD_AUDIO 0x20 // Audio data is included
#define CD_EXTEND 0x40 // Extended modes "A"-"z"
#define CD_PRINT 0x80 // goes in conjunction with CD_CMD
@@ -264,7 +264,7 @@
firstLoop = false;
}
- // Is lo nibble '00xx'?
+ // Is lo nibble '00xx'?
if ((eax & 0xC) == 0) {
for (;;) {
//@_rDN_Lp_1:
@@ -438,7 +438,7 @@
r = bigBuffer + paletteOffset;
- for (i = 0; i < 256; i++, r += 3) {
+ for (i = 0; i < 256; i++, r += 3) {
moviePal[i] = TINSEL_RGB(*r, *(r + 1), *(r + 2));
}
Modified: scummvm/trunk/engines/tinsel/cursor.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/cursor.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/cursor.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -303,7 +303,7 @@
bTempNoTrailers = true;
- for (i = 0; i < numTrails; i++) {
+ for (i = 0; i < numTrails; i++) {
if (ntrailData[i].trailObj != NULL) {
MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
ntrailData[i].trailObj = NULL;
@@ -512,7 +512,7 @@
DoCursorMove();
MultiHideObject(McurObj);
- IterationSize = ITERATION_BASE;
+ IterationSize = ITERATION_BASE;
}
/**
@@ -646,7 +646,7 @@
bWhoa = true; // Suspend cursor processes
for (int i = 0; i < numTrails; i++) {
- if (ntrailData[i].trailObj != NULL) {
+ if (ntrailData[i].trailObj != NULL) {
MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
ntrailData[i].trailObj = NULL;
}
Modified: scummvm/trunk/engines/tinsel/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/dialogs.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/dialogs.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -3584,7 +3584,7 @@
bMoveOnUnHide = true;
// Get the Actor Tag's or Tagged Actor's label for the conversation window title
- if (hPoly != NOPOLY) {
+ if (hPoly != NOPOLY) {
int x, y;
GetTagTag(hPoly, &InvD[INV_CONV].hInvTitle, &x, &y);
} else {
Modified: scummvm/trunk/engines/tinsel/drives.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/drives.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/drives.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -115,7 +115,7 @@
currentCD = nextCD;
-/* if (bNoCD) {
+/* if (bNoCD) {
strcpy(cdDirectory, hdDirectory);
cdLastBit[3] = currentCD;
strcat(cdDirectory, cdLastBit);
Modified: scummvm/trunk/engines/tinsel/handle.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/handle.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/handle.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -235,7 +235,7 @@
bytes = cdGraphStream.read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
// New code to try and handle CD read failures 24/2/97
- while (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES) {
+ while (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES) {
// Try again
cdGraphStream.seek(cdBaseHandle & OFFSETMASK, SEEK_SET);
bytes = cdGraphStream.read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
Modified: scummvm/trunk/engines/tinsel/mareels.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/mareels.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/mareels.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -155,7 +155,7 @@
else
d = D_UP;
- for (int i = 0; i < scrEntries; i++) {
+ for (int i = 0; i < scrEntries; i++) {
if (SCIdata[i].actor == ano && SCIdata[i].scale == scale1 && SCIdata[i].direction == d) {
if (SCIdata[i].reels[reel] == TF_NONE)
return 0;
Modified: scummvm/trunk/engines/tinsel/move.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/move.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/move.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -726,7 +726,7 @@
GotThere(pMover);
return;
} else {
- assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5001
+ assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5001
SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
}
}
@@ -775,7 +775,7 @@
// Fall through for LEAVING
case LEAVING:
- assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5002
+ assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5002
SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
targetX = pMover->ItargetX; // Desired position
targetY = pMover->ItargetY;
@@ -807,7 +807,7 @@
} else {
// Last node - we're off
pMover->npstatus = LEAVING;
- assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5003
+ assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5003
SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
targetX = pMover->ItargetX; // Desired position
targetY = pMover->ItargetY;
@@ -840,7 +840,7 @@
} else {
// Last node - we're off
pMover->npstatus = LEAVING;
- assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5004
+ assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5004
SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
targetX = pMover->ItargetX; // Desired position
targetY = pMover->ItargetY;
@@ -1396,7 +1396,7 @@
}
}
- assert(pMover->bIgPath || InPolygon(targetX, targetY, PATH) != NOPOLY); // Error 5005
+ assert(pMover->bIgPath || InPolygon(targetX, targetY, PATH) != NOPOLY); // Error 5005
SetMoverUltDest(pMover, targetX, targetY);
SetMoverIntDest(pMover, targetX, targetY);
@@ -1454,7 +1454,7 @@
if (pActor->ItargetX != -1 || pActor->ItargetY != -1) {
SetNextDest(pActor);
} else if (pActor->UtargetX != -1 || pActor->UtargetY != -1) {
- assert(pActor->bIgPath || InPolygon(pActor->UtargetX, pActor->UtargetY, PATH) != NOPOLY); // Error 5006
+ assert(pActor->bIgPath || InPolygon(pActor->UtargetX, pActor->UtargetY, PATH) != NOPOLY); // Error 5006
SetMoverIntDest(pActor, pActor->UtargetX, pActor->UtargetY);
SetNextDest(pActor);
}
@@ -1516,7 +1516,7 @@
if (lastnode == firstnode) {
pMover->hFnpath = NOPOLY;
pMover->npstatus = NOT_IN;
- assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5007
+ assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5007
SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
SetNextDest(pMover);
} else {
@@ -1526,7 +1526,7 @@
pMover->hFnpath = hPath;
pMover->line = firstnode ? firstnode - 1 : firstnode;
if (pMover->line == pMover->Tline && hPath == pMover->hUpath) {
- assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5008
+ assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5008
SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
SetMoverDest(pMover, pMover->UtargetX, pMover->UtargetY);
} else {
@@ -1547,7 +1547,7 @@
} else {
pMover->hFnpath = NOPOLY;
pMover->npstatus = NOT_IN;
- assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5009
+ assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5009
// Added 26/01/95
if (IsPolyCorner(hPath, pMover->ItargetX, pMover->ItargetY))
@@ -1735,7 +1735,7 @@
MoveActor(pActor);
if ((pActor->targetX != -1 || pActor->targetY != -1)
- && (wasx == pActor->objX && wasy == pActor->objY)) {
+ && (wasx == pActor->objX && wasy == pActor->objY)) {
for (i=0; i < NUMBER; i++) {
MoveActor(pActor);
if (wasx != pActor->objX || wasy != pActor->objY)
Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/music.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -141,7 +141,7 @@
84, 85, 86, 3124, 88, 89, 90, 88, 2, 2, // 121-130
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 131-140
3141, 91, 92, 93, 94, 94, 95, 96, 52, 4, // 141-150
- 97, 98, 99, 99 // 151-154
+ 97, 98, 99, 99 // 151-154
};
int GetTrackNumber(SCNHANDLE hMidi) {
@@ -252,7 +252,7 @@
// Store the length
//dwLastSeqLen = dwSeqLen;
} else {
- // dwFileOffset == dwLastMidiIndex
+ // dwFileOffset == dwLastMidiIndex
_vm->_midiMusic->stop();
_vm->_midiMusic->playXMIDI(midiBuffer.pDat, dwSeqLen, bLoop);
}
@@ -301,7 +301,7 @@
void SetMidiVolume(int vol) {
assert(vol >= 0 && vol <= Audio::Mixer::kMaxChannelVolume);
- if (vol == 0 && volMusic == 0) {
+ if (vol == 0 && volMusic == 0) {
// Nothing to do
} else if (vol == 0 && volMusic != 0) {
// Stop current midi sequence
Modified: scummvm/trunk/engines/tinsel/pcode.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/pcode.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/pcode.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -230,7 +230,7 @@
INT_CONTEXT *pic;
int i;
- for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++) {
+ for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++) {
if ((pic->GSort == GS_MASTER) || (pic->GSort == GS_GPROCESS)) {
memset(pic, 0, sizeof(INT_CONTEXT));
pic->GSort = GS_NONE;
@@ -762,7 +762,7 @@
int i, j;
// Check all waited for have someone waiting
- for (i = 0; i < NUM_INTERPRET; i++) {
+ for (i = 0; i < NUM_INTERPRET; i++) {
// If someone is supposedly waiting for this one
if ((icList + i)->GSort != GS_NONE && (icList + i)->waitNumber2) {
// Someone really must be waiting for this one
Modified: scummvm/trunk/engines/tinsel/pcode.h
===================================================================
--- scummvm/trunk/engines/tinsel/pcode.h 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/pcode.h 2009-03-07 19:24:31 UTC (rev 39203)
@@ -129,7 +129,7 @@
#define CONV_END 2 //
#define CONTROL_OFF 0 // control()
-#define CONTROL_ON 1 // parameter
+#define CONTROL_ON 1 // parameter
#define CONTROL_OFFV 2 //
#define CONTROL_OFFV2 3 //
#define CONTROL_STARTOFF 4 //
Modified: scummvm/trunk/engines/tinsel/pdisplay.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/pdisplay.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/pdisplay.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -270,7 +270,7 @@
bPointingActive = false;
- for (_ctx->i = 0; _ctx->i < MAX_POLY; _ctx->i++) {
+ for (_ctx->i = 0; _ctx->i < MAX_POLY; _ctx->i++) {
_ctx->hPoly = GetPolyHandle(_ctx->i);
if (_ctx->hPoly != NOPOLY && PolyType(_ctx->hPoly) == TAG && PolyIsPointedTo(_ctx->hPoly)) {
Modified: scummvm/trunk/engines/tinsel/play.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/play.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/play.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -50,7 +50,7 @@
int16 y; // } - set to (-1, -1) if none.
int16 z; // normally 0, set if from restore
int16 speed; // Film speed
- int16 actorid; // Set if called from an actor code block
+ int16 actorid; // Set if called from an actor code block
uint8 splay; // Set if called from splay()
uint8 bTop; // Set if called from topplay()
uint8 bRestore;
@@ -996,7 +996,7 @@
ppi.bTop = bTop;
ppi.sf = sfact;
ppi.escOn = escOn;
- ppi.myescEvent = myescEvent;
+ ppi.myescEvent = myescEvent;
// Start display process for each reel in the film
for (int i = FROM_LE_32(pFilm->numreels) - 1; i >= 0; i--) {
Modified: scummvm/trunk/engines/tinsel/rince.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/rince.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/rince.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -761,7 +761,7 @@
while (1) {
if (pActor->bSpecReel) {
- if (!pActor->bHidden)
+ if (!pActor->bHidden)
#ifdef DEBUG
assert(StepAnimScript(&pActor->actorAnim) != ScriptFinished); // Actor reel has finished!
#else
Modified: scummvm/trunk/engines/tinsel/sched.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sched.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/sched.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -671,7 +671,7 @@
*/
void KillGlobalProcesses(void) {
- for (uint32 i = 0; i < numGlobalProcess; ++i) {
+ for (uint32 i = 0; i < numGlobalProcess; ++i) {
g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1);
}
}
@@ -692,7 +692,7 @@
uint32 i; // Loop counter
_ctx->pProc = NULL;
- for (i = 0; i < numGlobalProcess; ++i) {
+ for (i = 0; i < numGlobalProcess; ++i) {
if (pGlobalProcess[i].processId == procID) {
assert(pGlobalProcess[i].hProcessCode); // Must have some code to run
Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/sound.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -325,7 +325,7 @@
* @param id Identifier of sample to be checked
*/
bool SoundManager::sampleExists(int id) {
- if (_vm->_mixer->isReady()) {
+ if (_vm->_mixer->isReady()) {
// make sure id is in range
if (id > 0 && id < _sampleIndexLen) {
// check for a sample index
@@ -406,7 +406,7 @@
return;
// open sample index file in binary mode
- if (f.open(_vm->getSampleIndex(sampleLanguage))) {
+ if (f.open(_vm->getSampleIndex(sampleLanguage))) {
// get length of index file
f.seek(0, SEEK_END); // move to end of file
_sampleIndexLen = f.pos(); // get file pointer
@@ -445,7 +445,7 @@
char buf[50];
sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage));
GUI::MessageDialog dialog(buf, "OK");
- dialog.runModal();
+ dialog.runModal();
error(CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage));
}
@@ -455,7 +455,7 @@
char buf[50];
sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleFile(sampleLanguage));
GUI::MessageDialog dialog(buf, "OK");
- dialog.runModal();
+ dialog.runModal();
error(CANNOT_FIND_FILE, _vm->getSampleFile(sampleLanguage));
}
Modified: scummvm/trunk/engines/tinsel/strres.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/strres.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/strres.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -100,7 +100,7 @@
char buf[50];
sprintf(buf, CANNOT_FIND_FILE, _vm->getTextFile(newLang));
GUI::MessageDialog dialog(buf, "OK");
- dialog.runModal();
+ dialog.runModal();
error(CANNOT_FIND_FILE, _vm->getTextFile(newLang));
}
Modified: scummvm/trunk/engines/tinsel/sysvar.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sysvar.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/sysvar.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -93,7 +93,7 @@
0, // SYS_MaximumYoffset
0, // SYS_DefaultFxDimFactor
- 0, // SYS_SceneFxDimFactor
+ 0, // SYS_SceneFxDimFactor
0x606060, // SYS_HighlightRGB
WIN_PC, // SYS_Platform,
Modified: scummvm/trunk/engines/tinsel/timers.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/timers.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/timers.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -41,7 +41,7 @@
#define MAX_TIMERS 16
struct TIMER {
- int tno; /**< Timer number */
+ int tno; /**< Timer number */
int ticks; /**< Tick count */
int secs; /**< Second count */
int delta; /**< Increment/decrement value */
Modified: scummvm/trunk/engines/tinsel/tinlib.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinlib.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tinsel/tinlib.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -474,7 +474,7 @@
char *cptr = (char *)FindChunk(MASTER_SCNHANDLE, CHUNK_TIME_STAMPS);
- switch (which) {
+ switch (which) {
case VER_GLITTER:
memcpy(buffer, cptr, length);
break;
@@ -1977,7 +1977,7 @@
if (_ctx->bSample) {
// Wait for sample to end whether or not
if (!_vm->_mixer->isSoundHandleActive(_ctx->handle)) {
- if (_ctx->pText == NULL || speedText == DEFTEXTSPEED) {
+ if (_ctx->pText == NULL || speedText == DEFTEXTSPEED) {
// No text or speed modification - just depends on sample
break;
} else {
Modified: scummvm/trunk/engines/tucker/tucker.cpp
===================================================================
--- scummvm/trunk/engines/tucker/tucker.cpp 2009-03-07 19:23:47 UTC (rev 39202)
+++ scummvm/trunk/engines/tucker/tucker.cpp 2009-03-07 19:24:31 UTC (rev 39203)
@@ -1055,7 +1055,7 @@
} else {
moveUpInventoryObjects();
}
- } else {
+ } else {
if (_selectedObjectType == 3) {
setActionForInventoryObject();
} else if (_actionVerb != 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