[Scummvm-cvs-logs] CVS: scummvm/kyra cpsimage.cpp,1.5,1.6 font.cpp,1.7,1.8 kyra.cpp,1.27,1.28 resource.cpp,1.9,1.10 resource.h,1.7,1.8 script.cpp,1.11,1.12

[Max Horn]

Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28088/kyra

Modified Files:
	cpsimage.cpp font.cpp kyra.cpp resource.cpp resource.h 
	script.cpp 
Log Message:
Comply to our coding conventions

Index: cpsimage.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/cpsimage.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cpsimage.cpp	9 Jan 2005 16:06:29 -0000	1.5
+++ cpsimage.cpp	8 May 2005 21:49:42 -0000	1.6
@@ -61,7 +61,7 @@
 	_cpsHeader._pal = bufferstream.readUint32LE();
 		
 	// lets check a bit
-	if(_cpsHeader._pal == 0x3000000) {
+	if (_cpsHeader._pal == 0x3000000) {
 		// if this was a compressed palette you should have strange graphics
 			
 		uint8* palbuffer = new uint8[768];
@@ -79,9 +79,9 @@
 	uint8* imagebuffer = &buffer[bufferstream.pos()];
 	assert(imagebuffer);
 		
-	if(_cpsHeader._format == 4) {
+	if (_cpsHeader._format == 4) {
 		Compression::decode80(imagebuffer, _image);
-	} else if(_cpsHeader._format == 3) {
+	} else if (_cpsHeader._format == 3) {
 		Compression::decode3(imagebuffer, _image, _cpsHeader._imagesize);
 	} else {
 		error("unknown CPS format %d", _cpsHeader._format);
@@ -89,7 +89,7 @@
 		
 	int16 width = getWidthFromCPSRes(_cpsHeader._imagesize);
 		
-	if(width == -1) {
+	if (width == -1) {
 		warning("unknown CPS width(imagesize: %d)", _cpsHeader._imagesize);
 		delete [] buffer;
 		return;

Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/font.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- font.cpp	3 Mar 2005 21:42:20 -0000	1.7
+++ font.cpp	8 May 2005 21:49:42 -0000	1.8
@@ -55,7 +55,7 @@
 	_fontHeader._height = bufferstream.readByte();	
 	
 	// tests for the magic values
-	if(_fontHeader._magic1 != FontHeader_Magic1 || _fontHeader._magic2 != FontHeader_Magic2 ||
+	if (_fontHeader._magic1 != FontHeader_Magic1 || _fontHeader._magic2 != FontHeader_Magic2 ||
 		_fontHeader._magic3 != FontHeader_Magic3) {
 		error("magic vars in the fontheader are corrupt\n"
 			  "_magic1 = 0x%x, _magic2 = 0x%x, _magic3 = 0x%x",

Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kyra.cpp	25 Mar 2005 17:55:52 -0000	1.27
+++ kyra.cpp	8 May 2005 21:49:42 -0000	1.28
@@ -235,7 +235,7 @@
 		_midiDriver->playTrack(3);
 	}
 	
-	while(true) {
+	while (true) {
 		OSystem::Event event;
 		//if (_debugger->isAttached())
 		//	_debugger->onFrame();

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/resource.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- resource.cpp	9 Jan 2005 16:06:29 -0000	1.9
+++ resource.cpp	8 May 2005 21:49:42 -0000	1.10
@@ -212,7 +212,7 @@
 		// saves the name
 		chunk->_name = reinterpret_cast<const char*>(_buffer + pos);
 		pos += strlen(chunk->_name) + 1;
-		if(!(*chunk->_name))
+		if (!(*chunk->_name))
 			break;
 
 		endoffset = READ_LE_UINT32(_buffer + pos);

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/resource.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- resource.h	9 Jan 2005 16:06:29 -0000	1.7
+++ resource.h	8 May 2005 21:49:42 -0000	1.8
@@ -122,7 +122,7 @@
 	// only for testing :)
 	uint8 getColor(uint16 x, uint16 y) { return _image[y * _width + x]; }
 		
-	uint8& operator[](uint16 index) { if(index > _width * _height) return _image[0]; return _image[index]; }
+	uint8& operator[](uint16 index) { if (index > _width * _height) return _image[0]; return _image[index]; }
 
 protected:
 

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- script.cpp	22 Apr 2005 17:40:08 -0000	1.11
+++ script.cpp	8 May 2005 21:49:42 -0000	1.12
@@ -504,12 +504,12 @@
 	uint32 scriptStateAtStart = _scriptState;
 		
 	// runs the script
-	while(true) {
+	while (true) {
 		if ((uint32)_instructionPos > _chunks[kData]._size) {
 			debug("_instructionPos( = %d) > _chunks[kData]._size( = %d)", _instructionPos, _chunks[kData]._size);
 			_error = true;
 			break;
-		} else if(_instructionPos >= _nextScriptPos) {
+		} else if (_instructionPos >= _nextScriptPos) {
 			_scriptState = kScriptStopped;
 			break;
 		}