aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/cursor.cpp2
-rw-r--r--engines/scumm/detection.h12
-rw-r--r--engines/scumm/dialogs.cpp2
-rw-r--r--engines/scumm/dialogs.h4
-rw-r--r--engines/scumm/file_nes.cpp2
-rw-r--r--engines/scumm/gfx.cpp2
-rw-r--r--engines/scumm/he/animation_he.h2
-rw-r--r--engines/scumm/he/resource_he.h2
-rw-r--r--engines/scumm/he/script_v72he.cpp2
-rw-r--r--engines/scumm/he/sound_he.h2
-rw-r--r--engines/scumm/imuse_digi/dimuse_track.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_track.h2
-rw-r--r--engines/scumm/intern.h10
-rw-r--r--engines/scumm/module.mk2
-rw-r--r--engines/scumm/object.h2
-rw-r--r--engines/scumm/saveload.cpp6
-rw-r--r--engines/scumm/script_v6.cpp2
-rw-r--r--engines/scumm/scumm.h6
-rw-r--r--engines/scumm/sound.cpp4
-rw-r--r--engines/scumm/verbs.cpp2
20 files changed, 35 insertions, 35 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 899f920247..0d0e7b054b 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -163,7 +163,7 @@ void ScummEngine_v70he::setCursorFromImg(uint img, uint room, uint imgindex) {
void ScummEngine_v70he::setDefaultCursor() {
const uint16 *src;
int i, j;
- static const byte palette[] = {0, 0, 0, 0,
+ static const byte palette[] = {0, 0, 0, 0,
0xff, 0xff, 0xff, 0,
0, 0, 0, 0};
diff --git a/engines/scumm/detection.h b/engines/scumm/detection.h
index bc67aafb7e..26f6be8fec 100644
--- a/engines/scumm/detection.h
+++ b/engines/scumm/detection.h
@@ -39,7 +39,7 @@ struct GameSettings {
* The gameid of this game.
*/
const char *gameid;
-
+
/**
* An identifier which can be used to distinguish game variants.
* This string is also used to augment the description string
@@ -51,13 +51,13 @@ struct GameSettings {
* variant. Failing to obey this rule can lead to odd bugs.
*/
const char *variant;
-
+
/**
* An optional string that will be added to the 'preferredtarget'
* computed by the detector.
*/
const char *preferredTag;
-
+
/**
* The numerical gameid of this game.
* This is not in one-to-one correspondence with the gameid above.
@@ -72,16 +72,16 @@ struct GameSettings {
/** The HE subversion. */
byte heversion;
-
+
/** MidiDriverFlags values */
int midi;
-
+
/**
* Bitmask obtained by ORing various GameFeatures enums, and used
* to en-/disable certain features of this game variant.
*/
uint32 features;
-
+
/**
* Platform indicator, this is set to a value different from
* kPlatformUnknown if this game variant only existed for this
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 8977bc108f..e008ce2179 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -981,7 +981,7 @@ void DebugInputDialog::handleKeyDown(Common::KeyState state) {
draw();
reflowLayout();
setInfoText(total);
- }
+ }
}
} // End of namespace Scumm
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index b4cf8b1f85..7c99a0ebcc 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -124,7 +124,7 @@ protected:
int _page;
int _numPages;
-
+
const GameSettings _game;
void displayKeyBindings();
@@ -251,7 +251,7 @@ public:
protected:
int _value;
uint32 _timer;
-
+
void cycleValue();
};
diff --git a/engines/scumm/file_nes.cpp b/engines/scumm/file_nes.cpp
index 88b4253a1d..95f5eec4ea 100644
--- a/engines/scumm/file_nes.cpp
+++ b/engines/scumm/file_nes.cpp
@@ -471,7 +471,7 @@ static const ScummNESFile::Resource res_scripts_esp[179] = {
{ 0x247C5, 0x0027, NES_SCRIPT }, { 0x1A08C, 0x004E, NES_SCRIPT }, { 0x00000, 0x0000, NES_SCRIPT }, { 0x2B21B, 0x00A5, NES_SCRIPT }, { 0x2A0D1, 0x00B1, NES_SCRIPT },
{ 0x2A182, 0x0140, NES_SCRIPT }, { 0x197CF, 0x00BE, NES_SCRIPT }, { 0x1988D, 0x014D, NES_SCRIPT }, { 0x199DA, 0x0012, NES_SCRIPT }, { 0x2A2C2, 0x0005, NES_SCRIPT },
{ 0x2A2C7, 0x0005, NES_SCRIPT }, { 0x2A2CC, 0x0005, NES_SCRIPT }, { 0x2A2D1, 0x0005, NES_SCRIPT }, { 0x2A2D6, 0x0005, NES_SCRIPT }, { 0x216E8, 0x0033, NES_SCRIPT },
- { 0x2A2DB, 0x0005, NES_SCRIPT }, { 0x00000, 0x0000, NES_SCRIPT }, { 0x2A2E0, 0x009C, NES_SCRIPT }, { 0x2A37C, 0x009C, NES_SCRIPT }
+ { 0x2A2DB, 0x0005, NES_SCRIPT }, { 0x00000, 0x0000, NES_SCRIPT }, { 0x2A2E0, 0x009C, NES_SCRIPT }, { 0x2A37C, 0x009C, NES_SCRIPT }
};
static const ScummNESFile::Resource *res_scripts[ScummNESFile::kROMsetNum] = {
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 27b24ac23c..f28cbb3548 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -263,7 +263,7 @@ void GdiV1::roomChanged(byte *roomptr) {
decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 12), _C64.picMap, roomptr[4] * roomptr[5]);
decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 14), _C64.colorMap, roomptr[4] * roomptr[5]);
decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 16), _C64.maskMap, roomptr[4] * roomptr[5]);
-
+
// Read the mask data. The 16bit length value seems to always be 8 too big.
// See bug #1837375 for details on this.
const byte *maskPtr = roomptr + READ_LE_UINT16(roomptr + 18);
diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index d93c1317d7..1d04c3e5df 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -47,7 +47,7 @@ class MoviePlayer : public Graphics::DXAPlayer {
char baseName[40];
uint32 _flags;
uint32 _wizResNum;
-
+
public:
MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer);
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h
index 5e7a6bb96b..08f9a8108a 100644
--- a/engines/scumm/he/resource_he.h
+++ b/engines/scumm/he/resource_he.h
@@ -181,7 +181,7 @@ class Win32ResExtractor : public ResExtractor {
int level;
bool numeric_id;
bool is_directory;
-
+
char *get_resource_id_quoted();
} PACKED_STRUCT;
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index a3b1fd2c6b..c03be592d6 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -1709,7 +1709,7 @@ void ScummEngine_v72he::o72_openFile() {
int ScummEngine_v72he::readFileToArray(int slot, int32 size) {
writeVar(0, 0);
byte *data = defineArray(0, kByteArray, 0, 0, 0, size);
-
+
if (slot != -1) {
_hInFileTable[slot]->read(data, size + 1);
}
diff --git a/engines/scumm/he/sound_he.h b/engines/scumm/he/sound_he.h
index 5ee1f9e0b9..47ff145e6b 100644
--- a/engines/scumm/he/sound_he.h
+++ b/engines/scumm/he/sound_he.h
@@ -61,7 +61,7 @@ public: // Used by createSound()
public:
SoundHE(ScummEngine *parent, Audio::Mixer *mixer);
~SoundHE();
-
+
virtual void addSoundToQueue(int sound, int heOffset = 0, int heChannel = 0, int heFlags = 0);
virtual void addSoundToQueue2(int sound, int heOffset = 0, int heChannel = 0, int heFlags = 0);
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp
index a1a41ef251..d3c61a6a80 100644
--- a/engines/scumm/imuse_digi/dimuse_track.cpp
+++ b/engines/scumm/imuse_digi/dimuse_track.cpp
@@ -93,7 +93,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
debug(5, "IMuseDigital::startSound(%d, trackId:%d)", soundId, l);
Track *track = _track[l];
-
+
// Reset the track
memset(track, 0, sizeof(Track));
diff --git a/engines/scumm/imuse_digi/dimuse_track.h b/engines/scumm/imuse_digi/dimuse_track.h
index e613798569..0c6445c43a 100644
--- a/engines/scumm/imuse_digi/dimuse_track.h
+++ b/engines/scumm/imuse_digi/dimuse_track.h
@@ -81,7 +81,7 @@ struct Track {
Track() : soundId(-1), used(false), stream(NULL) {
}
-
+
int getPan() const { return (pan != 64) ? 2 * pan - 127 : 0; }
int getVol() const { return vol / 1000; }
Audio::Mixer::SoundType getType() const {
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index 3339780991..c693787e83 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -61,7 +61,7 @@ protected:
uint16 xStrips, yStrips;
bool isDrawn;
} _flashlight;
-
+
char _saveLoadVarsFilename[256];
public:
@@ -283,7 +283,7 @@ protected:
V2MouseoverBox _mouseOverBoxesV2[7];
int8 _mouseOverBoxV2;
-
+
char _sentenceBuf[256];
int _activeInventory;
@@ -568,7 +568,7 @@ protected:
int16 xpos, ypos;
byte color;
byte charset;
- byte text[256];
+ byte text[256];
};
/** BlastObjects to draw */
@@ -879,7 +879,7 @@ public:
char tag[12+1];
int32 offset;
};
-
+
protected:
int _verbLineSpacing;
bool _existLanguageFile;
@@ -893,7 +893,7 @@ protected:
int16 xpos, ypos;
byte color;
byte charset;
- byte text[256];
+ byte text[256];
bool actorSpeechMsg;
};
#else
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
index 47c1a9e55c..3a50bcab8c 100644
--- a/engines/scumm/module.mk
+++ b/engines/scumm/module.mk
@@ -120,5 +120,5 @@ ifdef BUILD_PLUGINS
PLUGIN := 1
endif
-# Include common rules
+# Include common rules
include $(srcdir)/rules.mk
diff --git a/engines/scumm/object.h b/engines/scumm/object.h
index f27e6a501e..2a817b2b88 100644
--- a/engines/scumm/object.h
+++ b/engines/scumm/object.h
@@ -45,7 +45,7 @@ enum ObjectStateV2 {
// FIXME: Not quite sure how to name state 8. It seems to mark some kind
// of "activation state" for the given object. E.g. is a door open?
// Is a drawer extended? In addition it is used to toggle the look
- // of objects that the user can "pick up" (i.e. it is set in
+ // of objects that the user can "pick up" (i.e. it is set in
// o2_pickupObject together with kObjectStateUntouchable). So in a sense,
// it can also mean "invisible" in some situations.
kObjectState_08 = 8
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 07b4141620..fac3ad9975 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -597,10 +597,10 @@ void ScummEngine::saveInfos(Common::OutSaveFile* file) {
// still save old format for older versions
section.timeTValue = time(0);
section.playtime = _system->getMillis() / 1000 - _engineStartTime;
-
+
tm curTime;
_system->getTimeAndDate(curTime);
-
+
section.date = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | (curTime.tm_year + 1900) & 0xFFFF;
section.time = (curTime.tm_hour & 0xFF) << 8 | (curTime.tm_min) & 0xFF;
@@ -1257,7 +1257,7 @@ void ScummEngine_v7::saveOrLoad(Serializer *s) {
s->saveLoadArrayOf(_subtitleQueue, ARRAYSIZE(_subtitleQueue), sizeof(_subtitleQueue[0]), subtitleQueueEntries);
s->saveLoadEntries(this, V7Entries);
-
+
if (s->getVersion() <= VER(68) && s->isLoading()) {
// WORKAROUND bug #1846049: Reset the default charset color to a sane value.
_string[0]._default.charset = 1;
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 599d70f280..2d195026ef 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2384,7 +2384,7 @@ void ScummEngine_v6::o6_talkActor() {
_forcedWaitForMessage = false;
_scriptPointer += resStrLen(_scriptPointer) + 1;
-
+
return;
}
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index fa86dec650..41f7784d36 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -391,7 +391,7 @@ public:
void increaseResourceCounter();
void resourceStats();
-
+
//protected:
bool validateResource(const char *str, int type, int index) const;
protected:
@@ -434,7 +434,7 @@ public:
protected:
VirtualMachineState vm;
-
+
bool _oldSoundsPaused;
public:
@@ -474,7 +474,7 @@ protected:
virtual void scummLoop_handleActors() = 0;
virtual void scummLoop_handleEffects();
virtual void scummLoop_handleSound();
-
+
virtual void runBootscript();
// Event handling
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index c27b34eb62..ae337030e1 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -394,7 +394,7 @@ void Sound::playSound(int soundID) {
*/
}
else if ((_vm->_game.platform == Common::kPlatformMacintosh) && (_vm->_game.id == GID_INDY3) && (ptr[26] == 0)) {
- // Sound fomat as used in Indy3 EGA Mac.
+ // Sound fomat as used in Indy3 EGA Mac.
// It seems to be closely related to the Amiga format, see player_v3a.cpp
// The following is known:
// offset 0, 16 LE: total size
@@ -424,7 +424,7 @@ void Sound::playSound(int soundID) {
if (loopcount > 1) {
// TODO: We can only loop once, or infinitely many times, but
// have no support for a finite number of repetitions.
- // This is
+ // This is
loopStart = READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8);
loopEnd = READ_BE_UINT16(ptr + 14);
flags |= Audio::Mixer::FLAG_LOOP;
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index cfc6afed7a..0648b7a641 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -635,7 +635,7 @@ void ScummEngine_v2::checkExecVerbs() {
}
}
}
-
+
// Generic keyboard input
runInputScript(4, _mouseAndKeyboardStat, 1);
} else if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 02:04:16 +0000