[Scummvm-cvs-logs] SF.net SVN: scummvm: [32254] scummvm/trunk/engines/kyra/resource.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat May 24 21:07:45 CEST 2008
Revision: 32254
http://scummvm.svn.sourceforge.net/scummvm/?rev=32254&view=rev
Author: lordhoto
Date: 2008-05-24 12:07:44 -0700 (Sat, 24 May 2008)
Log Message:
-----------
Formatting fixes.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2008-05-24 18:31:16 UTC (rev 32253)
+++ scummvm/trunk/engines/kyra/resource.cpp 2008-05-24 19:07:44 UTC (rev 32254)
@@ -724,23 +724,23 @@
_tables[0] = new uint8[3914];
assert(_tables[0]);
- _tables[1] = _tables[0] + 320;
- _tables[2] = _tables[0] + 352;
- _tables[3] = _tables[0] + 864;
- _tables[4] = _tables[0] + 2016;
- _tables[5] = _tables[0] + 2528;
- _tables[6] = _tables[0] + 2656;
- _tables[7] = _tables[0] + 2736;
- _tables[8] = _tables[0] + 2756;
+ _tables[1] = _tables[0] + 320;
+ _tables[2] = _tables[0] + 352;
+ _tables[3] = _tables[0] + 864;
+ _tables[4] = _tables[0] + 2016;
+ _tables[5] = _tables[0] + 2528;
+ _tables[6] = _tables[0] + 2656;
+ _tables[7] = _tables[0] + 2736;
+ _tables[8] = _tables[0] + 2756;
- _tables16[0] = (uint16*) (_tables[0] + 3268);
- _tables16[1] = (uint16*) (_tables[0] + 3302);
- _tables16[2] = (uint16*) (_tables[0] + 3338);
+ _tables16[0] = (uint16 *)(_tables[0] + 3268);
+ _tables16[1] = (uint16 *)(_tables[0] + 3302);
+ _tables16[2] = (uint16 *)(_tables[0] + 3338);
}
FileExpander::~FileExpander() {
delete _src;
- delete [] _tables[0];
+ delete[] _tables[0];
}
bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32 compressedSize) {
@@ -1075,9 +1075,9 @@
}
void FileCache::flush() {
- debug("total amount of cache memory used: %d", _size);
+ debug(1, "total amount of cache memory used: %d", _size);
for (Common::List<FileCacheEntry>::const_iterator c = _cachedFileList.begin(); c != _cachedFileList.end(); ++c)
- delete [] c->data;
+ delete[] c->data;
_cachedFileList.clear();
_size = 0;
}
@@ -1344,7 +1344,7 @@
tmpFile.close();
FileExpander().process(outbuffer, inbuffer, entry.size, entry.compressedSize);
- delete [] inbuffer;
+ delete[] inbuffer;
if (entry.size > INS_CACHE_THRESHOLD)
_fileCache.add(entry, outbuffer);
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