[Scummvm-cvs-logs] scummvm master -> 8f557cd4fe06c6fcb159e62d9fb99423f604704e
Strangerke
Strangerke at scummvm.org
Sat Nov 23 10:27:44 CET 2013
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e854c364a9 TSAGE: Janitorial - Fix more spacing errors
f05afb9bff TONY: Janitorial - Fix spacing errors
8f557cd4fe HOPKINS: Janitorial - Fix spacing errors
Commit: e854c364a9420cc75a84a0638065469ba50f5f27
https://github.com/scummvm/scummvm/commit/e854c364a9420cc75a84a0638065469ba50f5f27
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-23T01:25:59-08:00
Commit Message:
TSAGE: Janitorial - Fix more spacing errors
Changed paths:
engines/tsage/blue_force/blueforce_scenes3.cpp
engines/tsage/events.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 5dd795c..2bf4a82 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -4531,7 +4531,7 @@ void Scene360::signal() {
BF_GLOBALS._player.enableControl();
break;
case 3608:
- BF_GLOBALS._sceneManager.changeScene(355);
+ BF_GLOBALS._sceneManager.changeScene(355);
break;
case 3610:
BF_GLOBALS._sceneManager.changeScene(666);
diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp
index d2d8464..6baa654 100644
--- a/engines/tsage/events.cpp
+++ b/engines/tsage/events.cpp
@@ -71,7 +71,7 @@ bool EventsClass::pollEvent() {
break;
default:
- break;
+ break;
}
return true;
Commit: f05afb9bff48e35952971998f64b6a42ba5bbd70
https://github.com/scummvm/scummvm/commit/f05afb9bff48e35952971998f64b6a42ba5bbd70
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-23T01:26:29-08:00
Commit Message:
TONY: Janitorial - Fix spacing errors
Changed paths:
engines/tony/mpal/mpal.cpp
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 7010c23..5f2452d 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -1935,7 +1935,7 @@ bool mpalExecuteScript(int nScript) {
// !!! New process management
if (CoroScheduler.createProcess(ScriptThread, &s, sizeof(LpMpalScript)) == CORO_INVALID_PID_VALUE)
- return false;
+ return false;
return true;
}
Commit: 8f557cd4fe06c6fcb159e62d9fb99423f604704e
https://github.com/scummvm/scummvm/commit/8f557cd4fe06c6fcb159e62d9fb99423f604704e
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-23T01:26:45-08:00
Commit Message:
HOPKINS: Janitorial - Fix spacing errors
Changed paths:
engines/hopkins/events.cpp
engines/hopkins/graphics.cpp
engines/hopkins/talk.cpp
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index 51c66c4..d0c1dce 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -271,7 +271,7 @@ void EventsManager::pollEvents() {
_mouseButton = 0;
return;
default:
- break;
+ break;
}
}
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index de9f043..05b8296 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -1359,7 +1359,7 @@ void GraphicsManager::drawCompressedSprite(byte *surface, const byte *srcData, i
_posYClipped = 0;
_clipX1 = 0;
_clipY1 = 0;
- if ((xp300 <= _minX) || (yp300 <= _minY) || (xp300 >= _maxX + 300) || (yp300 >= _maxY + 300))
+ if ((xp300 <= _minX) || (yp300 <= _minY) || (xp300 >= _maxX + 300) || (yp300 >= _maxY + 300))
return;
// Clipped values are greater or equal to zero, thanks to the previous test
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 1bb6701..d218dd2 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -266,7 +266,7 @@ int TalkManager::dialogQuestion(bool animatedFl) {
int retVal = -1;
bool loopCond = false;
- do {
+ do {
int mousePosY = _vm->_events->getMouseY();
if (sentence1PosY < mousePosY && mousePosY < (sentence2PosY - 1)) {
_vm->_fontMan->setOptimalColor(6, 7, 8, 5);
More information about the Scummvm-git-logs
mailing list