[Scummvm-cvs-logs] SF.net SVN: scummvm:[55404] scummvm/trunk/engines/sci/graphics/robot.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat Jan 22 03:51:39 CET 2011
Revision: 55404
http://scummvm.svn.sourceforge.net/scummvm/?rev=55404&view=rev
Author: thebluegr
Date: 2011-01-22 02:51:39 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
SCI: Code formatting
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/robot.cpp
Modified: scummvm/trunk/engines/sci/graphics/robot.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/robot.cpp 2011-01-22 02:31:30 UTC (rev 55403)
+++ scummvm/trunk/engines/sci/graphics/robot.cpp 2011-01-22 02:51:39 UTC (rev 55404)
@@ -135,23 +135,21 @@
_palette->createFromData(paletteData, paletteSize, &resourcePal);
- for (int i = 0; i < 256; ++i)
- {
- savePal[i*4] = _palette->_sysPalette.colors[i].r;
- savePal[i*4+1] = _palette->_sysPalette.colors[i].g;
- savePal[i*4+2] = _palette->_sysPalette.colors[i].b;
- savePal[i*4+3] = 0;
+ for (int i = 0; i < 256; ++i) {
+ savePal[i * 4 + 0] = _palette->_sysPalette.colors[i].r;
+ savePal[i * 4 + 1] = _palette->_sysPalette.colors[i].g;
+ savePal[i * 4 + 2] = _palette->_sysPalette.colors[i].b;
+ savePal[i * 4 + 3] = 0;
}
memcpy(robotPal, savePal, sizeof(savePal));
- for (int i = 0; i < colorCount; ++i)
- {
+ for (int i = 0; i < colorCount; ++i) {
int index = i + startIndex;
- robotPal[index*4] = resourcePal.colors[index].r;
- robotPal[index*4+1] = resourcePal.colors[index].g;
- robotPal[index*4+2] = resourcePal.colors[index].b;
- robotPal[index*4+3] = 0;
+ robotPal[index * 4 + 0] = resourcePal.colors[index].r;
+ robotPal[index * 4 + 1] = resourcePal.colors[index].g;
+ robotPal[index * 4 + 2] = resourcePal.colors[index].b;
+ robotPal[index * 4 + 3] = 0;
}
g_system->setPalette(robotPal, 0, 256);
@@ -194,11 +192,11 @@
// Plus one so we can assert on this in the calling routine
// The last one should point to end-of-file, unless I'm misunderstanding something
for (int i = 1; i < _frameCount + 1; ++i)
- _imageStart[i] = _imageStart[i-1] + audioEnd[i-1];
+ _imageStart[i] = _imageStart[i - 1] + audioEnd[i - 1];
for (int i = 0; i < _frameCount; ++i)
- _audioStart[i] = _imageStart[i] + videoEnd[i-1];
+ _audioStart[i] = _imageStart[i] + videoEnd[i - 1];
for (int i = 0; i < _frameCount; ++i)
- _audioLen[i] = _imageStart[i+1] - _audioStart[i];
+ _audioLen[i] = _imageStart[i + 1] - _audioStart[i];
delete[] audioEnd;
delete[] videoEnd;
@@ -280,7 +278,7 @@
byte *videoData = _resourceData + _imageStart[frame];
byte percentage = videoData[3];
- return (float) percentage/100.0;
+ return (float) percentage / 100.0;
}
#endif
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