[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _console.cpp,1.8,1.9 _mouse.cpp,1.22,1.23 d_sound.cpp,1.73,1.74 menu.cpp,1.17,1.18
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Oct 7 23:59:08 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc7 scummvm.sln,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.31,1.32 build_display.h,1.6,1.7 console.cpp,1.16,1.17 mouse.cpp,1.23,1.24 save_rest.cpp,1.24,1.25 walker.cpp,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv31958/driver
Modified Files:
_console.cpp _mouse.cpp d_sound.cpp menu.cpp
Log Message:
Some more cosmetic changes while I'm considering the next move. (Or maybe
I'm just hoping that if I stall long enough, someone else will make the
move for me. :-)
Index: _console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_console.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- _console.cpp 4 Oct 2003 08:07:03 -0000 1.8
+++ _console.cpp 8 Oct 2003 06:58:34 -0000 1.9
@@ -109,7 +109,7 @@
warning("stub OpenConsole");
/*
if (consoleStatus)
- return(RDERR_ALREADYOPEN);
+ return RDERR_ALREADYOPEN;
if (consoleSprite == NULL)
{
@@ -119,13 +119,13 @@
}
if (consoleSprite == NULL)
- return(RDERR_OUTOFMEMORY);
+ return RDERR_OUTOFMEMORY;
memset(consoleSprite, 0, consoleSize);
*/
consoleStatus = 1;
- return(RD_OK);
+ return RD_OK;
}
@@ -137,14 +137,14 @@
{
if (!consoleStatus)
- return(RDERR_ALREADYCLOSED);
+ return RDERR_ALREADYCLOSED;
free(consoleSprite);
consoleSprite = NULL;
consoleStatus = 0;
- return(RD_OK);
+ return RD_OK;
}
Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- _mouse.cpp 4 Oct 2003 00:52:26 -0000 1.22
+++ _mouse.cpp 8 Oct 2003 06:58:34 -0000 1.23
@@ -296,7 +296,7 @@
if (ma) {
luggageAnim = (_mouseAnim *) malloc(size);
if (!luggageAnim)
- return(RDERR_OUTOFMEMORY);
+ return RDERR_OUTOFMEMORY;
memcpy((uint8 *) luggageAnim, ma, size);
luggageOffset = (int32 *) ((uint8 *) luggageAnim + sizeof(_mouseAnim));
Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- d_sound.cpp 4 Oct 2003 11:50:21 -0000 1.73
+++ d_sound.cpp 8 Oct 2003 06:58:34 -0000 1.74
@@ -1053,7 +1053,7 @@
}
}
- return (hr);
+ return hr;
*/
}
Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/menu.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- menu.cpp 4 Oct 2003 08:07:03 -0000 1.17
+++ menu.cpp 8 Oct 2003 06:58:34 -0000 1.18
@@ -240,7 +240,7 @@
int32 HideMenu(uint8 menu) {
// Check for invalid menu parameter
if (menu > RDMENU_BOTTOM)
- return(RDERR_INVALIDMENU);
+ return RDERR_INVALIDMENU;
// Check that the menu is not currently hidden, or in the process of
// being hidden.
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc7 scummvm.sln,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.31,1.32 build_display.h,1.6,1.7 console.cpp,1.16,1.17 mouse.cpp,1.23,1.24 save_rest.cpp,1.24,1.25 walker.cpp,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list