From 3917351a93c245903d793495dfb278745fae3e58 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 20 Apr 2006 00:54:30 +0000
Subject: Minor cleanup

svn-id: r22044
---
 engines/simon/simon.cpp | 7 ++++---
 engines/simon/simon.h   | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index 09c46a5ff5..fc634e723d 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -329,11 +329,12 @@ SimonEngine::SimonEngine(OSystem *syst)
 	_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 @@ void SimonEngine::loadZone(uint vga_res) {
 byte *SimonEngine::allocBlock(uint32 size) {
 	byte *block, *blockEnd;
 
-	_rejectCount = false;
+	_rejectCount = 0;
 
 	for (;;) {
 		block = _vgaBufFreeStart;
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index cb3cb8e796..cab10f614d 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -329,13 +329,14 @@ protected:
 	uint16 _scrollUpHitArea;
 	uint16 _scrollDownHitArea;
 
-	uint16 _noOverWrite;
 	volatile uint16 _paletteColorCount;
 
 	int _screenWidth, _screenHeight;
 
+	uint16 _noOverWrite;
 	byte _rejectCount;
 	bool _rejectBlock;
+
 	bool _fastFadeOutFlag;
 	bool _unkPalFlag;
 	bool _exitCutscene;
-- 
cgit v1.2.3