aboutsummaryrefslogtreecommitdiff
path: root/engines/drascula
diff options
context:
space:
mode:
authorEugene Sandulenko2016-10-09 14:59:58 +0200
committerEugene Sandulenko2016-10-09 14:59:58 +0200
commitdead4aa01446da2bf711e64a4e681be460fa1202 (patch)
tree149648f240e839900e18af10953c4408da1e9464 /engines/drascula
parentc5efd9f7487f4f51316d9ae6e6cbef3d35dd7b51 (diff)
downloadscummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.gz
scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.bz2
scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.zip
JANITORIAL: Remove trailing spaces
Diffstat (limited to 'engines/drascula')
-rw-r--r--engines/drascula/actors.cpp2
-rw-r--r--engines/drascula/graphics.cpp12
-rw-r--r--engines/drascula/saveload.cpp10
-rw-r--r--engines/drascula/talk.cpp6
4 files changed, 15 insertions, 15 deletions
diff --git a/engines/drascula/actors.cpp b/engines/drascula/actors.cpp
index b459c4539b..3b1ac7cb60 100644
--- a/engines/drascula/actors.cpp
+++ b/engines/drascula/actors.cpp
@@ -398,7 +398,7 @@ void DrasculaEngine::increaseFrameNum() {
curHeight = (int)newHeight;
curWidth = (int)newWidth;
}
-
+
// Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
// Chapter 5 Room 45 is the castle tower part
// Fixing the character's coordinate(0,0) in the tower section to prevent out of window coordinates and crash
diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index 6bfb2e1823..8634b6c586 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -217,7 +217,7 @@ void DrasculaEngine::print_abc(const char *said, int screenX, int screenY) {
int letterY = 0, letterX = 0, i;
uint len = strlen(said);
byte c;
-
+
byte *srcSurface = tableSurface;
if (_lang == kSpanish && currentChapter == 6)
srcSurface = extraSurface;
@@ -329,7 +329,7 @@ bool DrasculaEngine::textFitsCentered(char *text, int x) {
//if (x > 160)
// x = 315 - x;
//return (halfLen <= x);
-
+
// The commented out code above is what the original engine is doing. Instead of testing the
// upper bound if x is greater than 160 it takes the complement to 315 and test only the lower
// bounds.
@@ -349,15 +349,15 @@ bool DrasculaEngine::textFitsCentered(char *text, int x) {
void DrasculaEngine::centerText(const char *message, int textX, int textY) {
char msg[200];
Common::strlcpy(msg, message, 200);
-
+
// We make sure to have a width of at least 120 pixels by clipping the center.
// In theory since the screen width is 320 I would expect something like this:
// x = CLIP<int>(x, 60, 260);
// return (x - halfLen >= 0 && x + halfLen <= 319);
-
+
// The engines does things differently though. It tries to clips text at 315 instead of 319.
// See also the comment in textFitsCentered().
-
+
textX = CLIP<int>(textX, 60, 255);
// If the message fits on screen as-is, just print it here
@@ -424,7 +424,7 @@ void DrasculaEngine::centerText(const char *message, int textX, int textY) {
Common::strlcpy(messageLines[curLine++], messageCurLine, 41);
}
}
-
+
// The original starts to draw (nbLines + 2) lines above textY.
// Also clip to the screen height although the original does not do it.
int y = textY - (curLine + 2) * CHAR_HEIGHT;
diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp
index e99898da5a..a1d7d615ea 100644
--- a/engines/drascula/saveload.cpp
+++ b/engines/drascula/saveload.cpp
@@ -255,7 +255,7 @@ bool DrasculaEngine::loadGame(int slot) {
if (!(in = _saveFileMan->openForLoading(saveFileName))) {
error("missing savegame file %s", saveFileName.c_str());
}
-
+
// If we currently are in room 102 while being attached below the pendulum
// the character is invisible and some surface are temporarily used for other
// things. Reset those before loading the savegame otherwise we may have some
@@ -267,7 +267,7 @@ bool DrasculaEngine::loadGame(int slot) {
loadPic(97, extraSurface);
loadPic(99, backSurface);
}
-
+
loadMetaData(in, slot, true);
Graphics::skipThumbnail(*in);
@@ -300,7 +300,7 @@ bool DrasculaEngine::loadGame(int slot) {
if (!sscanf(currentData, "%d.ald", &roomNum)) {
error("Bad save format");
}
-
+
// When loading room 102 while being attached below the pendulum Some variables
// are not correctly set and can cause random crashes when calling enterRoom below.
// The crash occurs in moveCharacters() when accessing factor_red[curY + curHeight].
@@ -309,10 +309,10 @@ bool DrasculaEngine::loadGame(int slot) {
curY = 108;
curWidth = curHeight = 0;
}
-
+
enterRoom(roomNum);
selectVerb(kVerbNone);
-
+
// When loading room 102 while being attached below the pendulum we
// need to call activatePendulum() to properly initialized the scene.
if (_roomNumber == 102 && flags[1] == 2)
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index cc329b206b..7ac2cc6406 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -379,10 +379,10 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
int y_mask_talk = 170;
int face;
-
+
// Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
// Chapter 5 Room 45 is the castle tower part
- // We use this variable as a condition below because at the castle towers we don't want to draw out the head
+ // We use this variable as a condition below because at the castle towers we don't want to draw out the head
bool notTowers = !((currentChapter == 5) && (_roomNumber == 45));
if (currentChapter == 6) {
@@ -488,7 +488,7 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
centerText(said, 160, 25);
}
}
-
+
updateScreen();
updateEvents();