[Scummvm-cvs-logs] SF.net SVN: scummvm: [26326] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Thu Mar 29 23:03:33 CEST 2007
Revision: 26326
http://scummvm.svn.sourceforge.net/scummvm/?rev=26326&view=rev
Author: drmccoy
Date: 2007-03-29 14:03:32 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Fixing curly bracket style
Modified Paths:
--------------
scummvm/trunk/engines/gob/global.h
scummvm/trunk/engines/gob/inter.cpp
scummvm/trunk/engines/gob/mult_v2.cpp
scummvm/trunk/engines/gob/music.h
scummvm/trunk/engines/gob/scenery.cpp
Modified: scummvm/trunk/engines/gob/global.h
===================================================================
--- scummvm/trunk/engines/gob/global.h 2007-03-29 20:53:37 UTC (rev 26325)
+++ scummvm/trunk/engines/gob/global.h 2007-03-29 21:03:32 UTC (rev 26326)
@@ -132,8 +132,7 @@
Video::Color _savedPal[256];
int32 _savedBackSize;
- void clearVars(uint32 count)
- {
+ void clearVars(uint32 count) {
uint32 size = count * 4;
memset(_inter_variables, 0, size);
Modified: scummvm/trunk/engines/gob/inter.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter.cpp 2007-03-29 20:53:37 UTC (rev 26325)
+++ scummvm/trunk/engines/gob/inter.cpp 2007-03-29 21:03:32 UTC (rev 26326)
@@ -220,8 +220,8 @@
(startaddr == 0x0B92 && addr == 0x0C93 && // Castle
!strncmp(_vm->_game->_curTotFile, "avt019.tot", 10)) ||
(startaddr == 0x17D9 && addr == 0x18DA && // Finale
- !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10)))
- {
+ !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10))) {
+
_vm->_util->longDelay(5000);
}
} // End of workaround
Modified: scummvm/trunk/engines/gob/mult_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/mult_v2.cpp 2007-03-29 20:53:37 UTC (rev 26325)
+++ scummvm/trunk/engines/gob/mult_v2.cpp 2007-03-29 21:03:32 UTC (rev 26326)
@@ -893,8 +893,8 @@
if ((animObj1.newRight >= animObj2.newLeft) &&
(animObj2.newRight >= animObj1.newLeft) &&
(animObj1.newBottom >= animObj2.newTop) &&
- (animObj2.newBottom >= animObj1.newTop))
- {
+ (animObj2.newBottom >= animObj1.newTop)) {
+
_vm->_scenery->_toRedrawLeft = animObj2.newLeft;
_vm->_scenery->_toRedrawRight = animObj2.newRight;
_vm->_scenery->_toRedrawTop = animObj2.newTop;
Modified: scummvm/trunk/engines/gob/music.h
===================================================================
--- scummvm/trunk/engines/gob/music.h 2007-03-29 20:53:37 UTC (rev 26325)
+++ scummvm/trunk/engines/gob/music.h 2007-03-29 21:03:32 UTC (rev 26326)
@@ -45,8 +45,7 @@
void setRepeating (int32 repCount) { _repCount = repCount; }
int getIndex() const { return _index; }
void startPlay() { if (_data) _playing = true; }
- void stopPlay()
- {
+ void stopPlay() {
Common::StackLock slock(_mutex);
_playing = false;
}
Modified: scummvm/trunk/engines/gob/scenery.cpp
===================================================================
--- scummvm/trunk/engines/gob/scenery.cpp 2007-03-29 20:53:37 UTC (rev 26325)
+++ scummvm/trunk/engines/gob/scenery.cpp 2007-03-29 21:03:32 UTC (rev 26326)
@@ -588,8 +588,7 @@
if (frame >= layerPtr->framesCount)
return;
- if (flags & 1) // Do capture
- {
+ if (flags & 1) { // Do capture
updateAnim(layer, frame, animation, 0, drawDeltaX, drawDeltaY, 0);
if (_toRedrawLeft == -12345)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list