[Scummvm-cvs-logs] SF.net SVN: scummvm: [22044] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 22044
Author:   kirben
Date:     2006-04-19 17:54:30 -0700 (Wed, 19 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22044&view=rev

Log Message:
-----------
Minor cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-20 00:42:54 UTC (rev 22043)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-20 00:54:30 UTC (rev 22044)
@@ -329,11 +329,12 @@
 	_scrollUpHitArea = 0;
 	_scrollDownHitArea = 0;
 
-	_noOverWrite = 0xFFFF;
 	_paletteColorCount = 0;
 
+	_noOverWrite = 0xFFFF;
 	_rejectCount = 0;
-	_rejectBlock = 0;
+	_rejectBlock = false;
+
 	_fastFadeOutFlag = 0;
 	_unkPalFlag = 0;
 	_exitCutscene = 0;
@@ -2176,7 +2177,7 @@
 byte *SimonEngine::allocBlock(uint32 size) {
 	byte *block, *blockEnd;
 
-	_rejectCount = false;
+	_rejectCount = 0;
 
 	for (;;) {
 		block = _vgaBufFreeStart;

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-20 00:42:54 UTC (rev 22043)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-20 00:54:30 UTC (rev 22044)
@@ -329,13 +329,14 @@
 	uint16 _scrollUpHitArea;
 	uint16 _scrollDownHitArea;
 
-	uint16 _noOverWrite;
 	volatile uint16 _paletteColorCount;
 
 	int _screenWidth, _screenHeight;
 
+	uint16 _noOverWrite;
 	byte _rejectCount;
 	bool _rejectBlock;
+
 	bool _fastFadeOutFlag;
 	bool _unkPalFlag;
 	bool _exitCutscene;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.