[Scummvm-cvs-logs] scummvm master -> 2168d43d5d8c66cc4316e2bd0450ef108b27fda5
DrMcCoy
drmccoy at drmccoy.de
Wed May 28 23:26:46 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2168d43d5d MADS: Janitorial - Trim more trailing whitespace
Commit: 2168d43d5d8c66cc4316e2bd0450ef108b27fda5
https://github.com/scummvm/scummvm/commit/2168d43d5d8c66cc4316e2bd0450ef108b27fda5
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2014-05-28T23:25:49+02:00
Commit Message:
MADS: Janitorial - Trim more trailing whitespace
Changed paths:
engines/mads/debugger.cpp
engines/mads/messages.cpp
engines/mads/messages.h
engines/mads/msurface.cpp
engines/mads/nebular/nebular_scenes2.cpp
engines/mads/nebular/nebular_scenes3.cpp
engines/mads/nebular/sound_nebular.h
engines/mads/scene.cpp
diff --git a/engines/mads/debugger.cpp b/engines/mads/debugger.cpp
index f301b6c..1ff42c5 100644
--- a/engines/mads/debugger.cpp
+++ b/engines/mads/debugger.cpp
@@ -233,7 +233,7 @@ bool Debugger::Cmd_DumpVocab(int argc, const char **argv) {
}
Common::String cur = "\tNOUN_" + curVocab + " = 0x" + curId + ",\n";
-
+
outFile.writeString(cur.c_str());
}
@@ -294,7 +294,7 @@ bool Debugger::Cmd_DumpItems(int argc, const char **argv) {
}
Common::String cur = "\tOBJ_" + desc + " = " + curId + ",\n";
-
+
outFile.writeString(cur.c_str());
}
diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp
index ae56f87..0d74727 100644
--- a/engines/mads/messages.cpp
+++ b/engines/mads/messages.cpp
@@ -337,7 +337,7 @@ int KernelMessages::checkRandom() {
if (_randomMessages[i]._handle >= 0)
++total;
}
-
+
return total;
}
diff --git a/engines/mads/messages.h b/engines/mads/messages.h
index 1eff14b..a7411d9 100644
--- a/engines/mads/messages.h
+++ b/engines/mads/messages.h
@@ -94,7 +94,7 @@ private:
public:
Common::Array<KernelMessage> _entries;
Font *_talkFont;
-public:
+public:
KernelMessages(MADSEngine *vm);
~KernelMessages();
diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp
index 6d74fef..39c7808 100644
--- a/engines/mads/msurface.cpp
+++ b/engines/mads/msurface.cpp
@@ -407,7 +407,7 @@ void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth,
Common::Point pt((destP - (byte *)this->pixels) % this->pitch,
(destP - (byte *)this->pixels) / this->pitch);
int pixelDepth = (depthSurface == nullptr) ? 15 : depthSurface->getDepth(pt);
-
+
if ((*srcP != transparentColor) && (depth <= pixelDepth))
*destP = *srcP;
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 2379cf2..56e8c8a 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -789,7 +789,7 @@ void Scene202::actions() {
_vm->_dialogs->show(20219);
return;
}
-
+
if (_action.isAction(VERB_CLIMB_DOWN, NOUN_LADDER)) {
_action._inProgress = false;
return;
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index ba1af6e..6a6b36f 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -1329,7 +1329,7 @@ Scene309::Scene309(MADSEngine *vm) : Scene3xx(vm) {
_characterSpriteIndexes[i] = -1;
_messagesIndexes[i] = -1;
}
-
+
_lastFrame = -1;
_forceField.init();
}
diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h
index 2113b10..c485bd7 100644
--- a/engines/mads/nebular/sound_nebular.h
+++ b/engines/mads/nebular/sound_nebular.h
@@ -67,7 +67,7 @@ public:
int _field1D;
int _field1E;
int _field1F;
-
+
// TODO: Only used by asound.003. Figure out usage
byte _field20;
public:
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index d2d4bd8..e98648f 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -596,7 +596,7 @@ void Scene::loadAnimation(const Common::String &resName, int trigger) {
// scene, then free it before we create the new one
if (_activeAnimation)
freeAnimation();
-
+
DepthSurface depthSurface(_vm);
UserInterface interfaceSurface(_vm);
More information about the Scummvm-git-logs
mailing list