DREAMWEB: Accessor for kQuitrequested

scummvm · Nov 20, 2011 · 6cab17c · 6cab17c
1 parent 57fc322
commit 6cab17c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
@@ -81,7 +81,7 @@ void DreamGenContext::usemon() {
 		data.word(kMonadx) = di;
 		data.word(kMonady) = bx;
 		execcommand();
-		if (data.byte(kQuitrequested)) //TODO : Check why it crashes when put before the execcommand
+		if (quitRequested()) //TODO : Check why it crashes when put before the execcommand
 			break;
 	} while (al == 0);
 	getridoftemp();
@@ -117,7 +117,7 @@ void DreamGenContext::input() {
 		vsync();
 		delcurs();
 		readkey();
-		if (data.byte(kQuitrequested))
+		if (quitRequested())
 			return;
 		uint8 currentKey = data.byte(kCurrentkey);
 		if (currentKey == 0)

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
@@ -100,7 +100,7 @@ void DreamGenContext::dreamweb() {
 			cls();
 			setmode();
 			decide();
-			if (data.byte(kQuitrequested))
+			if (quitRequested())
 				return; // exit game
 
 			if (data.byte(kGetback) == 4)
@@ -114,11 +114,11 @@ void DreamGenContext::dreamweb() {
 			// "playgame"
 
 			titles();
-			if (data.byte(kQuitrequested))
+			if (quitRequested())
 				return; // exit game
 			credits();
 
-			if (data.byte(kQuitrequested))
+			if (quitRequested())
 				return; // exit game
 
 			clearchanges();
@@ -146,12 +146,12 @@ void DreamGenContext::dreamweb() {
 		// main loop
 		while (true) {
 
-			if (data.byte(kQuitrequested))
+			if (quitRequested())
 				return; // exit game
 
 			screenupdate();
 
-			if (data.byte(kQuitrequested))
+			if (quitRequested())
 				return; // exit game
 
 			if (data.byte(kWongame) != 0) {
@@ -203,10 +203,14 @@ void DreamGenContext::dreamweb() {
 	}
 }
 
+bool DreamGenContext::quitRequested() {
+	return data.byte(kQuitrequested);
+}
+
 void DreamGenContext::screenupdate() {
 	newplace();
 	mainscreen();
-	if (data.byte(kQuitrequested))
+	if (quitRequested())
 		return;
 	animpointer();
 	showpointer();
@@ -1949,7 +1953,7 @@ void DreamGenContext::hangon(uint16 frameCount) {
 	while (frameCount) {
 		vsync();
 		--frameCount;
-		if (data.byte(kQuitrequested))
+		if (quitRequested())
 			break;
 	}
 }
@@ -1979,7 +1983,7 @@ void DreamGenContext::hangonp(uint16 count) {
 		showpointer();
 		vsync();
 		dumppointer();
-		if (data.byte(kQuitrequested))
+		if (quitRequested())
 			break;
 		if (data.word(kMousebutton) != 0 && data.word(kMousebutton) != data.word(kOldbutton))
 			break;

diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
@@ -19,7 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-	void screenupdate();	
+	void screenupdate();
+	bool quitRequested();
 	void startup();
 	void startup1();
 	void switchryanon();