[Scummvm-cvs-logs] SF.net SVN: scummvm: [29019] scummvm/trunk/engines/agi

[thebluegr at users.sourceforge.net]

Revision: 29019
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29019&view=rev
Author:   thebluegr
Date:     2007-09-22 03:53:53 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
Simplified item handling code in Mickey

Modified Paths:
--------------
    scummvm/trunk/engines/agi/preagi_mickey.cpp
    scummvm/trunk/engines/agi/preagi_mickey.h

Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-22 10:36:20 UTC (rev 29018)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-22 10:53:53 UTC (rev 29019)
@@ -1453,9 +1453,7 @@
 		}
 		break;
 	case IDI_MSA_ACTION_GET_FLASHLIGHT:
-		if (game.fItem[IDI_MSA_ITEM_FLASHLIGHT]) {
-			printDatMessage(90);
-		} else {
+		if (!mickeyHasItem(IDI_MSA_ITEM_FLASHLIGHT)) {
 			game.iRmObj[game.iRoom] = IDI_MSA_OBJECT_NONE;
 			getItem(IDI_MSA_ITEM_FLASHLIGHT);
 			drawRoom();
@@ -1474,18 +1472,14 @@
 		}
 		break;
 	case IDI_MSA_ACTION_GET_CROWBAR:
-		if (game.fItem[IDI_MSA_ITEM_CROWBAR]) {
-			printDatMessage(90);
-		} else {
+		if (!mickeyHasItem(IDI_MSA_ITEM_CROWBAR)) {
 			game.iRmObj[game.iRoom]--;
 			getItem(IDI_MSA_ITEM_CROWBAR);
 			printDatMessage(arg);
 		}
 		break;
 	case IDI_MSA_ACTION_GET_WRENCH:
-		if (game.fItem[IDI_MSA_ITEM_WRENCH]) {
-			printDatMessage(90);
-		} else {
+		if (!mickeyHasItem(IDI_MSA_ITEM_WRENCH)) {
 			game.iRmObj[game.iRoom] -= 2;
 			getItem(IDI_MSA_ITEM_WRENCH);
 			printDatMessage(arg);
@@ -1503,36 +1497,28 @@
 		}
 		break;
 	case IDI_MSA_ACTION_GET_MATTRESS:
-		if (game.fItem[IDI_MSA_ITEM_MATTRESS]) {
-			printDatMessage(90);
-		} else {
+		if (!mickeyHasItem(IDI_MSA_ITEM_MATTRESS)) {
 			game.iRmObj[game.iRoom]--;
 			getItem(IDI_MSA_ITEM_MATTRESS);
 			printDatMessage(arg);
 		}
 		break;
 	case IDI_MSA_ACTION_GET_SCARF:
-		if (game.fItem[IDI_MSA_ITEM_SCARF]) {
-			printDatMessage(90);
-		} else {
+		if (!mickeyHasItem(IDI_MSA_ITEM_SCARF)) {
 			game.iRmObj[game.iRoom] -= 2;
 			getItem(IDI_MSA_ITEM_SCARF);
 			printDatMessage(arg);
 		}
 		break;
 	case IDI_MSA_ACTION_GET_SUNGLASSES:
-		if (game.fItem[IDI_MSA_ITEM_SUNGLASSES]) {
-			printDatMessage(90);
-		} else {
+		if (!mickeyHasItem(IDI_MSA_ITEM_SUNGLASSES)) {
 			game.iRmObj[game.iRoom]--;
 			getItem(IDI_MSA_ITEM_SUNGLASSES);
 			printDatMessage(arg);
 		}
 		break;
 	case IDI_MSA_ACTION_GET_SCALE:
-		if (game.fItem[IDI_MSA_ITEM_SCALE]) {
-			printDatMessage(90);
-		} else {
+		if (!mickeyHasItem(IDI_MSA_ITEM_SCALE)) {
 			game.iRmMenu[IDI_MSA_PIC_VENUS_WEIGH] = 1;
 			game.iRmMenu[IDI_MSA_PIC_NEPTUNE_WEIGH] = 1;
 			game.iRmMenu[IDI_MSA_PIC_MERCURY_WEIGH] = 1;

Modified: scummvm/trunk/engines/agi/preagi_mickey.h
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.h	2007-09-22 10:36:20 UTC (rev 29018)
+++ scummvm/trunk/engines/agi/preagi_mickey.h	2007-09-22 10:53:53 UTC (rev 29019)
@@ -117,6 +117,7 @@
 #define IDI_MSA_MSG_SPACESUIT_CANT_WEAR_ON_EARTH	12
 #define IDI_MSA_MSG_SHIP_LAUNCH						16
 #define IDI_MSA_MSG_SHIP_LAND						22
+#define IDI_MSA_MSG_MICKEY_ALREADY_HAS_ITEM			90
 
 // screen
 
@@ -809,6 +810,15 @@
 		}
 		return false;
 	}
+
+	bool mickeyHasItem(int item) {
+		if (game.fItem[item]) {
+			printDatMessage(IDI_MSA_MSG_MICKEY_ALREADY_HAS_ITEM);
+			return true;
+		} else {
+			return false;
+		}
+	}
 };
 
 } // End of namespace Agi


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