aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen
diff options
context:
space:
mode:
Diffstat (limited to 'engines/xeen')
-rw-r--r--engines/xeen/character.cpp2
-rw-r--r--engines/xeen/debugger.cpp2
-rw-r--r--engines/xeen/dialogs/dialogs_create_char.cpp2
-rw-r--r--engines/xeen/interface_minimap.cpp4
-rw-r--r--engines/xeen/locations.cpp8
-rw-r--r--engines/xeen/patcher.cpp4
-rw-r--r--engines/xeen/worldofxeen/clouds_cutscenes.cpp6
-rw-r--r--engines/xeen/worldofxeen/darkside_cutscenes.cpp6
-rw-r--r--engines/xeen/worldofxeen/worldofxeen_menu.cpp8
9 files changed, 21 insertions, 21 deletions
diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 736d0db8a7..afc013ba89 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -196,7 +196,7 @@ void Character::synchronize(Common::Serializer &s) {
// upper nibble of the first 64 bytes. Except for award 9, which was a full
// byte counter counting the number of times the warzone was awarded
for (int idx = 0; idx < 64; ++idx) {
- byte b = (idx == WARZONE_AWARD) ? _awards[idx] :
+ byte b = (idx == WARZONE_AWARD) ? _awards[idx] :
(_awards[idx] ? 0x1 : 0) | (_awards[idx + 64] ? 0x10 : 0);
s.syncAsByte(b);
if (s.isLoading()) {
diff --git a/engines/xeen/debugger.cpp b/engines/xeen/debugger.cpp
index 322833eed6..7d8f170129 100644
--- a/engines/xeen/debugger.cpp
+++ b/engines/xeen/debugger.cpp
@@ -170,7 +170,7 @@ bool Debugger::cmdMap(int argc, const char **argv) {
int mapId = strToInt(argv[1]);
int x = argc < 3 ? 8 : strToInt(argv[2]);
int y = argc < 4 ? 8 : strToInt(argv[3]);
-
+
if (argc == 5)
map._loadCcNum = strToInt(argv[4]);
map.load(mapId);
diff --git a/engines/xeen/dialogs/dialogs_create_char.cpp b/engines/xeen/dialogs/dialogs_create_char.cpp
index 3115fbd10a..9f3e2a51f1 100644
--- a/engines/xeen/dialogs/dialogs_create_char.cpp
+++ b/engines/xeen/dialogs/dialogs_create_char.cpp
@@ -554,7 +554,7 @@ int CreateCharacterDialog::exchangeAttribute(int srcAttr) {
break;
int destAttr = getAttribFromKeycode(_buttonValue);
-
+
if (destAttr != -1 && srcAttr != destAttr) {
result = destAttr;
break;
diff --git a/engines/xeen/interface_minimap.cpp b/engines/xeen/interface_minimap.cpp
index 583156cf5a..5805047d9e 100644
--- a/engines/xeen/interface_minimap.cpp
+++ b/engines/xeen/interface_minimap.cpp
@@ -161,7 +161,7 @@ void InterfaceMinimap::drawIndoorsMinimap() {
(map._currentSteppedOn || party._wizardEyeActive)) {
map._tileSprites.draw(1,
map.mazeData()._surfaceTypes[map._currentSurfaceId] + 36,
- Common::Point(MINIMAP_XSTART - (TILE_WIDTH / 2),
+ Common::Point(MINIMAP_XSTART - (TILE_WIDTH / 2),
MINIMAP_YSTART - (TILE_HEIGHT / 2) + 1));
}
@@ -192,7 +192,7 @@ void InterfaceMinimap::drawIndoorsMinimap() {
}
// Handle drawing partially clip top row and left column
- for (int xp = MINIMAP_XSTART, yp = MINIMAP_YSTART + (MINIMAP_SIZE - 1) * TILE_HEIGHT,
+ for (int xp = MINIMAP_XSTART, yp = MINIMAP_YSTART + (MINIMAP_SIZE - 1) * TILE_HEIGHT,
mazeX = pt.x - MINIMAP_DIFF, mazeY = pt.y + MINIMAP_DIFF;
mazeX <= (pt.x - MINIMAP_DIFF);
xp += TILE_WIDTH, yp -= TILE_HEIGHT, ++mazeX, --mazeY) {
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 6c4b6ac8c4..63478bab5f 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -1146,7 +1146,7 @@ int ArenaLocation::show() {
int count = party._activeParty[0]._awards[WARZONE_AWARD];
int suffixNum = (count < 10) ? count : 0;
Common::String msg = Common::String::format(format.c_str(), count, SUFFIXES[suffixNum]);
-
+
LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER, msg, 1);
map.load(28);
@@ -1383,7 +1383,7 @@ int ReaperCutscene::show() {
events.updateGameCounter();
screen.blitFrom(savedBg);
sprites1.draw(0, 0, Common::Point(REAPER_X1[_ccNum][idx], REAPER_Y1[_ccNum][idx]), 0, idx);
-
+
if (_ccNum) {
sprites1.draw(0, 1, Common::Point(REAPER_X2[idx], REAPER_Y1[1][idx]), 0, idx);
sprites1.draw(0, party._isNight ? 3 : 2, Common::Point(REAPER_X3[idx], REAPER_Y1[1][idx]), 0, idx);
@@ -1592,7 +1592,7 @@ int GolemCutscene::show() {
if (!_ccNum)
sprites2[0].draw(0, 2, Common::Point(idx + g_vm->getRandomNumber(9) - 5,
g_vm->getRandomNumber(9) - 5), SPRFLAG_800);
-
+
if (!_ccNum && !sound.isSoundPlaying())
sound.playSound("ogre.voc");
@@ -2101,7 +2101,7 @@ int SphinxCutscene::show() {
// Save background
Graphics::ManagedSurface bgSurface;
bgSurface.copyFrom(screen);
-
+
for (int idx = 8; idx >= 0; --idx) {
events.updateGameCounter();
screen.blitFrom(bgSurface);
diff --git a/engines/xeen/patcher.cpp b/engines/xeen/patcher.cpp
index f9d9ee77ff..10c8664776 100644
--- a/engines/xeen/patcher.cpp
+++ b/engines/xeen/patcher.cpp
@@ -57,7 +57,7 @@ void Patcher::patchScripts() {
FileManager &files = *g_vm->_files;
Map &map = *g_vm->_map;
Party &party = *g_vm->_party;
-
+
uint gameId = g_vm->getGameID();
if (gameId == GType_WorldOfXeen)
gameId = files._ccNum ? GType_DarkSide : GType_Clouds;
@@ -66,7 +66,7 @@ void Patcher::patchScripts() {
const ScriptEntry &se = SCRIPT_PATCHES[patchIdx];
if (se._gameId != gameId || se._mapId != party._mazeId)
continue;
-
+
MazeEvent evt;
Common::MemoryReadStream memStream(se._data, se._data[0] + 1);
Common::Serializer s(&memStream, nullptr);
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index 43164a1ce9..dd87f5807a 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -278,7 +278,7 @@ bool CloudsCutscenes::showCloudsIntroInner() {
sound.playVoice(_INTRO_VOCS[lineCtr]);
}
- for (int frameCtr = 0, lookup = 0; sound.isSoundPlaying() ||
+ for (int frameCtr = 0, lookup = 0; sound.isSoundPlaying() ||
(_subtitles.active() && (lineCtr == 0 || lineCtr == 4 || lineCtr == 10 || lineCtr == 13)); ) {
groupo.draw(0, 0);
groupo.draw(0, 1, Common::Point(160, 0));
@@ -332,7 +332,7 @@ bool CloudsCutscenes::showCloudsIntroInner() {
windows[0].writeString(Res.CLOUDS_INTRO1);
ctr5 = (ctr5 + 1) % 19;
-
+
WAIT(1);
continue;
}
@@ -985,7 +985,7 @@ bool CloudsCutscenes::showCloudsEnding5() {
king.draw(0, 1, Common::Point(160, 0));
screen.fadeIn();
_subtitles.setLine(13);
-
+
sound.playVoice("king4.voc");
do {
king.draw(0, 0, Common::Point(0, 0));
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index ef5c1df157..db9254f067 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -104,7 +104,7 @@ bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) {
// Render the next frame
screen.vertMerge(0);
nwc[nwcIndex].draw(0, nwcFrame);
-
+
switch (idx) {
case 17:
sound.playSound(voc[0]);
@@ -128,7 +128,7 @@ bool DarkSideCutscenes::showDarkSideTitle(bool seenIntro) {
for (int idx = 0; idx < 42 && !g_vm->shouldExit(); ++idx) {
screen.vertMerge(SCREEN_HEIGHT);
nwc[3].draw(0, idx);
-
+
switch (idx) {
case 3:
sound.playFX(40);
@@ -808,7 +808,7 @@ bool DarkSideCutscenes::showWorldOfXeenLogo() {
for (int idx = 0; idx < 21; ++idx) {
screen.restoreBackground();
wfire[6].draw(0, idx, Common::Point(0, 45));
-
+
switch (idx) {
case 0:
case 11:
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
index 5beff45337..6d80e62806 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -57,7 +57,7 @@ void MainMenuContainer::show() {
MainMenuContainer::MainMenuContainer(const char *spritesName1, const char *spritesName2, const char *spritesName3) :
_animateCtr(0), _dialog(nullptr) {
g_vm->_files->setGameCc(g_vm->getGameID() == GType_Clouds ? 0 : 1);
-
+
_backgroundSprites.resize(1 + (spritesName2 ? 1 : 0) + (spritesName3 ? 1 : 0));
_backgroundSprites[0].load(spritesName1);
if (spritesName2)
@@ -120,7 +120,7 @@ void MainMenuContainer::execute() {
// Check for events
events.updateGameCounter();
-
+
if (events.wait(4, true)) {
if (_dialog) {
// There's a dialog active, so let it handle the event
@@ -337,7 +337,7 @@ void CloudsMenuDialog::loadButtons() {
void CloudsMenuDialog::draw() {
Windows &windows = *g_vm->_windows;
Window &w = windows[GAME_WINDOW];
-
+
w.frame();
w.writeString(Common::String::format(Res.OPTIONS_MENU, Res.GAME_NAMES[0], g_vm->_gameWon[0] ? 117 : 92, 1992));
drawButtons(&w);
@@ -584,7 +584,7 @@ void OtherOptionsDialog::draw() {
w.frame();
w.writeString(Common::String::format(Res.OPTIONS_MENU,
- Res.GAME_NAMES[g_vm->getGameID() == GType_WorldOfXeen ? 2 : 1],
+ Res.GAME_NAMES[g_vm->getGameID() == GType_WorldOfXeen ? 2 : 1],
w.getBounds().height() - 33, 1993));
drawButtons(&w);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 21:55:18 +0000