aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/actor.cpp6
-rw-r--r--engines/scumm/detection.cpp10
-rw-r--r--engines/scumm/dialogs.cpp20
-rw-r--r--engines/scumm/gfx.cpp6
-rw-r--r--engines/scumm/he/resource_he.cpp2
-rw-r--r--engines/scumm/he/script_v80he.cpp4
-rw-r--r--engines/scumm/he/wiz_he.cpp2
-rw-r--r--engines/scumm/player_v2a.cpp4
-rw-r--r--engines/scumm/scumm.h2
-rw-r--r--engines/scumm/smush/codec47.cpp2
-rw-r--r--engines/scumm/smush/imuse_channel.cpp2
11 files changed, 30 insertions, 30 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 1ea0da86d8..fdb066a4a3 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1440,7 +1440,7 @@ void Actor::drawActorCostume(bool hitTestMode) {
}
setupActorScale();
-
+
BaseCostumeRenderer *bcr = _vm->_costumeRenderer;
prepareDrawActorCostume(bcr);
@@ -1456,7 +1456,7 @@ void Actor::drawActorCostume(bool hitTestMode) {
}
}
-
+
void Actor::prepareDrawActorCostume(BaseCostumeRenderer *bcr) {
bcr->_actorID = _number;
@@ -1507,7 +1507,7 @@ void Actor::prepareDrawActorCostume(BaseCostumeRenderer *bcr) {
void ActorHE::prepareDrawActorCostume(BaseCostumeRenderer *bcr) {
Actor::prepareDrawActorCostume(bcr);
-
+
bcr->_actorX += _heOffsX;
bcr->_actorY += _heOffsY;
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 326ee6d4c2..d9db5fc574 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -683,11 +683,11 @@ public:
virtual const char *getName() const;
virtual const char *getCopyright() const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const;
virtual GameList getSupportedGames() const;
virtual GameDescriptor findGame(const char *gameid) const;
virtual GameList detectGames(const Common::FSList &fslist) const;
-
+
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
virtual SaveStateList listSaves(const char *target) const;
@@ -984,7 +984,7 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const {
for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
// Obtain the last 2 digits of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 2);
-
+
if (slotNum >= 0 && slotNum <= 99) {
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
@@ -1016,7 +1016,7 @@ SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int
// TODO: Cleanup
Graphics::Surface *thumbnail = ScummEngine::loadThumbnailFromSlot(target, slot);
-
+
SaveStateDescriptor desc(slot, saveDesc);
desc.setDeletableFlag(true);
desc.setThumbnail(thumbnail);
@@ -1029,7 +1029,7 @@ SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int
int year = infos.date & 0xFFFF;
desc.setSaveDate(year, month, day);
-
+
int hour = (infos.time >> 8) & 0xFF;
int minutes = infos.time & 0xFF;
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 6738e8d71a..cdbc2e3661 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -228,7 +228,7 @@ enum {
SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel, bool saveMode, ScummEngine *engine)
: Dialog("ScummSaveLoad"), _saveMode(saveMode), _list(0), _chooseButton(0), _gfxWidget(0), _vm(engine) {
-
+
_backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial;
new StaticTextWidget(this, "ScummSaveLoad.Title", title);
@@ -318,17 +318,17 @@ void SaveLoadChooser::reflowLayout() {
if (g_gui.xmlEval()->getVar("Globals.ScummSaveLoad.ExtInfo.Visible") == 1) {
int16 x, y;
uint16 w, h;
-
+
if (!g_gui.xmlEval()->getWidgetData("ScummSaveLoad.Thumbnail", x, y, w, h))
error("Error when loading position data for Save/Load Thumbnails.");
-
- int thumbW = kThumbnailWidth;
+
+ int thumbW = kThumbnailWidth;
int thumbH = ((g_system->getHeight() % 200 && g_system->getHeight() != 350) ? kThumbnailHeight2 : kThumbnailHeight1);
int thumbX = x + (w >> 1) - (thumbW >> 1);
int thumbY = y + kLineHeight;
-
+
_container->resize(x, y, w, h);
- _gfxWidget->resize(thumbX, thumbY, thumbW, thumbH);
+ _gfxWidget->resize(thumbX, thumbY, thumbW, thumbH);
int height = thumbY + thumbH + kLineHeight;
@@ -380,7 +380,7 @@ void SaveLoadChooser::updateInfos(bool redraw) {
InfoStuff infos;
memset(&infos, 0, sizeof(InfoStuff));
- if (selItem >= 0 && !_list->getSelectedString().empty()
+ if (selItem >= 0 && !_list->getSelectedString().empty()
&& _vm->loadInfosFromSlot(_saveMode ? selItem + 1 : selItem, &infos)) {
char buffer[32];
snprintf(buffer, 32, "Date: %.2d.%.2d.%.4d",
@@ -654,13 +654,13 @@ void HelpDialog::reflowLayout() {
int lineHeight = g_gui.getFontHeight();
int16 x, y;
uint16 w, h;
-
+
g_gui.xmlEval()->getWidgetData("ScummHelp.HelpText", x, y, w, h);
-
+
int keyW = w * 20 / 100;
int dscX = x + keyW + 32;
int dscW = w * 80 / 100;
-
+
int xoff = (_w >> 1) - (w >> 1);
for (int i = 0; i < HELP_NUM_LINES; i++) {
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 4e8c22479d..04cde129fa 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -614,13 +614,13 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
const uint32 *src32 = (const uint32 *)src;
const uint32 *text32 = (const uint32 *)text;
uint32 *dst32 = (uint32 *)_compositeBuf;
-
+
vsPitch >>= 2;
const int textPitch = (_textSurface.pitch - width * m) >> 2;
for (int h = height * m; h > 0; --h) {
for (int w = width*m; w > 0; w-=4) {
uint32 temp = *text32++;
-
+
// Generate a byte mask for those text pixels (bytes) with
// value CHARSET_MASK_TRANSPARENCY. In the end, each byte
// in mask will be either equal to 0x00 or 0xFF.
@@ -629,7 +629,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
uint32 mask = temp ^ CHARSET_MASK_TRANSPARENCY_32;
mask = (((mask & 0x7f7f7f7f) + 0x7f7f7f7f) | mask) & 0x80808080;
mask = ((mask >> 7) + 0x7f7f7f7f) ^ 0x80808080;
-
+
// The following line is equivalent to this code:
// *dst32++ = (*src32++ & mask) | (temp & ~mask);
// However, some compilers can generate somewhat better
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 74789bcc1e..49d0e2f729 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -526,7 +526,7 @@ int Win32ResExtractor::do_resources_recurs(WinLibrary *fi, WinResource *base,
else
return 0;
}
-
+
/* process each resource listed */
for (c = 0 ; c < rescnt ; c++) {
/* (over)write the corresponding WinResource holder with the current */
diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp
index aa78757c53..55dc62c38d 100644
--- a/engines/scumm/he/script_v80he.cpp
+++ b/engines/scumm/he/script_v80he.cpp
@@ -475,7 +475,7 @@ void ScummEngine_v80he::o80_readConfigFile() {
memcpy(section, "BluesTreasureHunt-Disc1\0", 24);
else if (!strcmp((char *)section, "Blue'sTreasureHunt-Disc2"))
memcpy(section, "BluesTreasureHunt-Disc2\0", 24);
- }
+ }
Common::ConfigFile ConfFile;
if (!strcmp((char *)filename + r, "map.ini"))
@@ -543,7 +543,7 @@ void ScummEngine_v80he::o80_writeConfigFile() {
memcpy(section, "BluesTreasureHunt-Disc1\0", 24);
else if (!strcmp((char *)section, "Blue'sTreasureHunt-Disc2"))
memcpy(section, "BluesTreasureHunt-Disc2\0", 24);
- }
+ }
Common::ConfigFile ConfFile;
ConfFile.loadFromSaveFile((const char *)filename + r);
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index c661812d09..55fc6cc900 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -933,7 +933,7 @@ uint8 Wiz::getWizPixelColor(const uint8 *data, int x, int y, int w, int h, uint
return (READ_LE_UINT16(data) & 1) ? color : READ_LE_UINT16(data + 1);
else
return (data[0] & 1) ? color : data[1];
-
+
}
uint8 Wiz::getRawWizPixelColor(const uint8 *data, int x, int y, int w, int h, uint bitDepth, uint8 color) {
diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp
index 757b4a453f..719328d23f 100644
--- a/engines/scumm/player_v2a.cpp
+++ b/engines/scumm/player_v2a.cpp
@@ -1474,7 +1474,7 @@ private:
uint16 _curfreq;
};
-// plays a series of double-looped sounds at varying frequencies and delays, very specialized
+// plays a series of double-looped sounds at varying frequencies and delays, very specialized
// Guardian of the Sphinx, perhaps?
class V2A_Sound_Special_Zak82 : public V2A_Sound_Base<4> {
public:
@@ -1616,7 +1616,7 @@ public:
}
_mod->stopChannel(_id | 0x000);
_mode = 1;
-
+
size = 0x2B8E;
offset = _offset;
assert(offset + size <= _offset + _size);
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 76ebab0f7c..e040cb1593 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -626,7 +626,7 @@ protected:
void loadResource(Serializer *ser, int type, int index);
Common::String makeSavegameName(int slot, bool temporary) const {
- return makeSavegameName(_targetName, slot, temporary);
+ return makeSavegameName(_targetName, slot, temporary);
}
int getKeyState(int key);
diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp
index 4bf2581365..62bc0bb098 100644
--- a/engines/scumm/smush/codec47.cpp
+++ b/engines/scumm/smush/codec47.cpp
@@ -566,7 +566,7 @@ Codec47Decoder::~Codec47Decoder() {
bool Codec47Decoder::decode(byte *dst, const byte *src) {
if ((_tableBig == NULL) || (_tableSmall == NULL) || (_deltaBuf == NULL))
return false;
-
+
_offset1 = _deltaBufs[1] - _curBuf;
_offset2 = _deltaBufs[0] - _curBuf;
diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp
index fd34a8f60d..cab836fcc8 100644
--- a/engines/scumm/smush/imuse_channel.cpp
+++ b/engines/scumm/smush/imuse_channel.cpp
@@ -139,7 +139,7 @@ bool ImuseChannel::handleMap(byte *data) {
default:
error("Unknown iMUS subChunk found : %s, %d", tag2str(subType), subSize);
}
-
+
data += subSize;
size -= subSize;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 06:36:22 +0000