[Scummvm-cvs-logs] SF.net SVN: scummvm:[33780] residual/trunk/engine
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Mon Aug 11 21:16:26 CEST 2008
Revision: 33780
http://scummvm.svn.sourceforge.net/scummvm/?rev=33780&view=rev
Author: aquadran
Date: 2008-08-11 19:16:21 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
formating
Modified Paths:
--------------
residual/trunk/engine/backend/platform/sdl/driver_gl.cpp
residual/trunk/engine/backend/platform/sdl/driver_tinygl.cpp
residual/trunk/engine/lab.cpp
residual/trunk/engine/scene.cpp
residual/trunk/engine/smush/vima.cpp
Modified: residual/trunk/engine/backend/platform/sdl/driver_gl.cpp
===================================================================
--- residual/trunk/engine/backend/platform/sdl/driver_gl.cpp 2008-08-11 19:14:03 UTC (rev 33779)
+++ residual/trunk/engine/backend/platform/sdl/driver_gl.cpp 2008-08-11 19:16:21 UTC (rev 33780)
@@ -75,7 +75,7 @@
}
DriverGL::~DriverGL() {
- delete []_storedDisplay;
+ delete[] _storedDisplay;
}
void DriverGL::toggleFullscreenMode() {
@@ -461,7 +461,7 @@
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
- delete [] texData;
+ delete[] texData;
} else {
for (int pic = 0; pic < bitmap->_numImages; pic++) {
uint16 *zbufPtr = reinterpret_cast<uint16 *>(bitmap->_data[pic]);
@@ -811,7 +811,7 @@
}
}
- delete [] texData;
+ delete[] texData;
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
return handle;
@@ -900,7 +900,7 @@
}
Bitmap *screenshot = new Bitmap((char *) buffer, w, h, "screenshot");
- delete []buffer;
+ delete[] buffer;
return screenshot;
}
Modified: residual/trunk/engine/backend/platform/sdl/driver_tinygl.cpp
===================================================================
--- residual/trunk/engine/backend/platform/sdl/driver_tinygl.cpp 2008-08-11 19:14:03 UTC (rev 33779)
+++ residual/trunk/engine/backend/platform/sdl/driver_tinygl.cpp 2008-08-11 19:16:21 UTC (rev 33780)
@@ -128,7 +128,7 @@
}
DriverTinyGL::~DriverTinyGL() {
- delete []_storedDisplay;
+ delete[] _storedDisplay;
tglClose();
ZB_close(_zb);
}
@@ -672,7 +672,7 @@
}
Bitmap *screenshot = new Bitmap((char *)buffer, w, h, "screenshot");
- delete []buffer;
+ delete[] buffer;
return screenshot;
}
Modified: residual/trunk/engine/lab.cpp
===================================================================
--- residual/trunk/engine/lab.cpp 2008-08-11 19:14:03 UTC (rev 33779)
+++ residual/trunk/engine/lab.cpp 2008-08-11 19:16:21 UTC (rev 33780)
@@ -72,7 +72,7 @@
_fileMap.size();
}
- delete [] string_table;
+ delete []string_table;
return true;
}
Modified: residual/trunk/engine/scene.cpp
===================================================================
--- residual/trunk/engine/scene.cpp 2008-08-11 19:14:03 UTC (rev 33779)
+++ residual/trunk/engine/scene.cpp 2008-08-11 19:16:21 UTC (rev 33780)
@@ -110,12 +110,12 @@
}
Scene::~Scene() {
- delete [] _cmaps;
- delete [] _setups;
+ delete[] _cmaps;
+ delete[] _setups;
if (_lights)
- delete [] _lights;
+ delete[] _lights;
if (_sectors)
- delete [] _sectors;
+ delete[] _sectors;
for (StateList::iterator i = _states.begin(); i != _states.end(); i++)
delete (*i);
}
Modified: residual/trunk/engine/smush/vima.cpp
===================================================================
--- residual/trunk/engine/smush/vima.cpp 2008-08-11 19:14:03 UTC (rev 33779)
+++ residual/trunk/engine/smush/vima.cpp 2008-08-11 19:16:21 UTC (rev 33780)
@@ -111,7 +111,7 @@
imcTable1Pos < sizeof(imcTable1) / sizeof(imcTable1[0]); imcTable1Pos++, destTablePos += 64) {
int put = 0, count, tableValue;
for (count = 32, tableValue = imcTable1[imcTable1Pos]; count != 0; count >>= 1, tableValue >>= 1) {
- if ((incer & count) != 0) {
+ if (incer & count) {
put += tableValue;
}
}
@@ -156,7 +156,7 @@
int val = (bits >> (16 - bitPtr)) & (highBit | lowBits);
if (bitPtr > 7) {
- bits = ((bits & 0xff) << 8) | *(uint8*)(src++);
+ bits = ((bits & 0xff) << 8) | *(uint8 *)(src++);
bitPtr -= 8;
}
@@ -167,16 +167,16 @@
if (val == lowBits) {
outputWord = ((int16)(bits << bitPtr) & 0xffffff00);
- bits = ((bits & 0xff) << 8) | *(uint8*)(src++);
+ bits = ((bits & 0xff) << 8) | *(uint8 *)(src++);
outputWord |= ((bits >> (8 - bitPtr)) & 0xff);
- bits = ((bits & 0xff) << 8) | *(uint8*)(src++);
+ bits = ((bits & 0xff) << 8) | *(uint8 *)(src++);
} else {
int index = (val << (7 - numBits)) | (currTablePos << 6);
int delta = destTable[index];
- if (val != 0)
+ if (val)
delta += (imcTable1[currTablePos] >> (numBits - 1));
- if (highBit != 0)
+ if (highBit)
delta = -delta;
outputWord += delta;
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