[Scummvm-cvs-logs] CVS: scummvm/sword2 scroll.cpp,1.13,1.14 sound.cpp,1.33,1.34 speech.cpp,1.46,1.47 sword2.cpp,1.79,1.80 walker.cpp,1.25,1.26
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Nov 8 11:48:27 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.25,1.26 d_draw.cpp,1.42,1.43 d_draw.h,1.13,1.14 d_sound.cpp,1.79,1.80 driver96.h,1.56,1.57
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.12,1.13 adlibmusic.cpp,1.14,1.15 gmmusic.cpp,1.14,1.15 mt32music.cpp,1.14,1.15 musicbase.cpp,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv318
Modified Files:
scroll.cpp sound.cpp speech.cpp sword2.cpp walker.cpp
Log Message:
cleanup whitespaces
Index: scroll.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/scroll.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- scroll.cpp 8 Nov 2003 18:15:34 -0000 1.13
+++ scroll.cpp 8 Nov 2003 19:47:20 -0000 1.14
@@ -52,13 +52,13 @@
if (_thisScreen.max_scroll_offset_x > SCROLL_X)
_thisScreen.scroll_offset_x = SCROLL_X;
else
- _thisScreen.scroll_offset_x = _thisScreen.max_scroll_offset_x;
+ _thisScreen.scroll_offset_x = _thisScreen.max_scroll_offset_x;
// ensure not too far down
if (_thisScreen.max_scroll_offset_y > SCROLL_Y)
_thisScreen.scroll_offset_y = SCROLL_Y;
else
- _thisScreen.scroll_offset_y = _thisScreen.max_scroll_offset_y;
+ _thisScreen.scroll_offset_y = _thisScreen.max_scroll_offset_y;
} else {
// George's offset from the centre - the desired position
// for him
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- sound.cpp 8 Nov 2003 15:47:51 -0000 1.33
+++ sound.cpp 8 Nov 2003 19:47:20 -0000 1.34
@@ -357,7 +357,7 @@
// interruption to gameplay
_vm->_loopingMusicId = params[0];
} else {
- loopFlag = false;
+ loopFlag = false;
// don't need to restart this tune after control panel or
// restore
Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/speech.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- speech.cpp 8 Nov 2003 18:15:34 -0000 1.46
+++ speech.cpp 8 Nov 2003 19:47:20 -0000 1.47
@@ -1453,7 +1453,7 @@
// if a specific width has been set up for this character,
// then override the default
- if (ob_speech->width)
+ if (ob_speech->width)
textWidth = ob_speech->width;
else
textWidth = 400;
Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- sword2.cpp 8 Nov 2003 18:15:34 -0000 1.79
+++ sword2.cpp 8 Nov 2003 19:47:20 -0000 1.80
@@ -546,7 +546,7 @@
setFullPalette(0xffffffff);
// If graphics level at max, turn up again
- if (_graphicsLevelFudged) {
+ if (_graphicsLevelFudged) {
gui->updateGraphicsLevel(3);
_graphicsLevelFudged = false;
}
Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/walker.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- walker.cpp 8 Nov 2003 18:15:35 -0000 1.25
+++ walker.cpp 8 Nov 2003 19:47:20 -0000 1.26
@@ -327,7 +327,7 @@
error("Invalid direction (%d) in fnTurn", params[4]);
ob_mega = (Object_mega *) params[2];
-
+
pars[4] = ob_mega->feet_x;
pars[5] = ob_mega->feet_y;
pars[6] = params[4]; // DIRECTION to turn to
@@ -704,7 +704,7 @@
}
}
- // first cycle builds the route - thereafter merely follows it
+ // first cycle builds the route - thereafter merely follows it
// Call fnWalk() with target coords set to feet coords. RESULT will
// be 1 when it finishes, or 0 if it failed to build route.
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.25,1.26 d_draw.cpp,1.42,1.43 d_draw.h,1.13,1.14 d_sound.cpp,1.79,1.80 driver96.h,1.56,1.57
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.12,1.13 adlibmusic.cpp,1.14,1.15 gmmusic.cpp,1.14,1.15 mt32music.cpp,1.14,1.15 musicbase.cpp,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list