Old targets will be auto updated.

Many non-English versions will be broken until information is updated.

svn-id: r19563

1 files changed, 7 insertions, 7 deletions

diff --git a/simon/verb.cpp b/simon/verb.cpp
index e5b6153425..2a3be4b6eb 100644
--- a/simon/verb.cpp
+++ b/simon/verb.cpp
@@ -191,7 +191,7 @@ void SimonEngine::defocusHitarea() {
 	HitArea *last;
 	HitArea *ha;
 
-	if (_game & GF_SIMON2) {
+	if (getGameType() == GType_SIMON2) {
 		if (_bitArray[4] & 0x8000) {
 			o_unk_120(202);
 			_lastHitArea2Ptr = NULL;
@@ -265,7 +265,7 @@ void SimonEngine::showActionString(uint x, const byte *string) {
 void SimonEngine::hitareaChangedHelper() {
 	FillOrCopyStruct *fcs;
 
-	if (_game & GF_SIMON2) {
+	if (getGameType() == GType_SIMON2) {
 		if (_bitArray[4] & 0x8000)
 			return;
 	}
@@ -362,7 +362,7 @@ void SimonEngine::hitarea_proc_1() {
 	uint id;
 	HitArea *ha;
 
-	if (_game & GF_SIMON2) {
+	if (getGameType() == GType_SIMON2) {
 		id = 2;
 		if (!(_bitArray[4] & 0x8000))
 			id = (_mouseY >= 136) ? 102 : 101;
@@ -391,7 +391,7 @@ void SimonEngine::handle_verb_hitarea(HitArea *ha) {
 	if (ha == tmp)
 		return;
 
-	if (!(_game & GF_SIMON2)) {
+	if (!(getGameType() == GType_SIMON2)) {
 		if (tmp != NULL) {
 			tmp->flags |= 8;
 			video_toggle_colors(tmp, 0xd5, 0xd0, 0xd5, 0xA);
@@ -414,7 +414,7 @@ void SimonEngine::handle_verb_hitarea(HitArea *ha) {
 }
 
 void SimonEngine::hitarea_leave(HitArea *ha) {
-	if (!(_game & GF_SIMON2)) {
+	if (!(getGameType() == GType_SIMON2)) {
 		video_toggle_colors(ha, 0xdf, 0xd5, 0xda, 5);
 	} else {
 		video_toggle_colors(ha, 0xe7, 0xe5, 0xe6, 1);
@@ -458,7 +458,7 @@ void SimonEngine::setup_hitarea_from_pos(uint x, uint y, uint mode) {
 	uint16 x_ = x;
 	const uint16 y_ = y;
 
-	if (_game & GF_SIMON2) {
+	if (getGameType() == GType_SIMON2) {
 		if (_bitArray[4] & 0x8000 || y < 134) {
 			x_ += _scrollX * 8;
 		}
@@ -528,7 +528,7 @@ bool SimonEngine::hitarea_proc_2(uint a) {
 	uint x;
 	const byte *string_ptr;
 
-	if (_game & GF_SIMON2) {
+	if (getGameType() == GType_SIMON2) {
 		if (_bitArray[4] & 0x8000) {
 			Subroutine *sub;
 			_variableArray[84] = a;