Cleanup and simplification

svn-id: r30405

5 files changed, 14 insertions, 36 deletions

diff --git a/engines/agi/preagi_common.h b/engines/agi/preagi_common.h
index 1c8705d37b..8b6dc0ee59 100644
--- a/engines/agi/preagi_common.h
+++ b/engines/agi/preagi_common.h
@@ -34,6 +34,9 @@ namespace Agi {
 #define IDA_DEFAULT		0x0F
 #define IDA_DEFAULT_REV	0xF0
 
+#define IDI_SND_OSCILLATOR_FREQUENCY	1193180
+#define IDI_SND_TIMER_RESOLUTION		0.0182
+
 #define kColorDefault 0x1337
 
 #define IDI_MAX_ROW_PIC	20
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index 9ddf664e78..8987310340 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -34,10 +34,6 @@
 #include "agi/preagi_mickey.h"
 #include "agi/graphics.h"
 
-#define IDI_SND_OSCILLATOR_FREQUENCY	1193180
-#define IDI_SND_TIMER_RESOLUTION		0.0182
-#define MSA_SAVEGAME_VERSION			1
-
 namespace Agi {
 
 int Mickey::getDat(int iRoom) {
diff --git a/engines/agi/preagi_mickey.h b/engines/agi/preagi_mickey.h
index 350456b982..5e421d24ac 100644
--- a/engines/agi/preagi_mickey.h
+++ b/engines/agi/preagi_mickey.h
@@ -30,8 +30,9 @@
 
 namespace Agi {
 
-// strings
+#define MSA_SAVEGAME_VERSION			1
 
+// strings
 #define IDS_MSA_PATH_DAT	"dat/%s"
 #define IDS_MSA_PATH_OBJ	"obj/%s.ooo"
 #define IDS_MSA_PATH_PIC	"%d.pic"
diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index daf043c0f5..af653d34c8 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -35,11 +35,6 @@
 
 namespace Agi {
 
-// default attributes
-#define IDA_DEFAULT				0x0F
-#define IDA_DEFAULT_REV			0xF0
-#define WTP_SAVEGAME_VERSION	1
-
 void Winnie::parseRoomHeader(WTP_ROOM_HDR *roomHdr, byte *buffer, int len) {
 	int i;
 
@@ -716,15 +711,9 @@ void Winnie::drawMenu(char *szMenu, int iSel, int fCanSel[]) {
 	
 	switch(iSel) {
 	case IDI_WTP_SEL_OPT_1:
-		iRow = IDI_WTP_ROW_OPTION_1;
-		iCol = IDI_WTP_COL_OPTION;
-		break;
 	case IDI_WTP_SEL_OPT_2:
-		iRow = IDI_WTP_ROW_OPTION_2;
-		iCol = IDI_WTP_COL_OPTION;
-		break;
 	case IDI_WTP_SEL_OPT_3:
-		iRow = IDI_WTP_ROW_OPTION_3;
+		iRow = IDI_WTP_ROW_OPTION_1 + iSel;
 		iCol = IDI_WTP_COL_OPTION;
 		break;
 	case IDI_WTP_SEL_NORTH:
@@ -752,7 +741,7 @@ void Winnie::drawMenu(char *szMenu, int iSel, int fCanSel[]) {
 		iCol = IDI_WTP_COL_DROP;
 		break;
 	}
-	_vm->drawStr(iRow, iCol - 1, IDA_DEFAULT, IDS_WTP_SELECTION);
+	_vm->drawStr(iRow, iCol - 1, IDA_DEFAULT, ">");
 	_vm->_gfx->doUpdate();
 	_vm->_system->updateScreen(); //TODO: Move to game's main loop
 }
@@ -774,13 +763,9 @@ void Winnie::decMenuSel(int *iSel, int fCanSel[]) {
 void Winnie::getMenuMouseSel(int *iSel, int fCanSel[], int x, int y) {
 	switch(y) {
 	case IDI_WTP_ROW_OPTION_1:
-		if (fCanSel[IDI_WTP_SEL_OPT_1])	*iSel = IDI_WTP_SEL_OPT_1;
-		break;
 	case IDI_WTP_ROW_OPTION_2:
-		if (fCanSel[IDI_WTP_SEL_OPT_2])	*iSel = IDI_WTP_SEL_OPT_2;
-		break;
 	case IDI_WTP_ROW_OPTION_3:
-		if (fCanSel[IDI_WTP_SEL_OPT_3])	*iSel = IDI_WTP_SEL_OPT_3;
+		if (fCanSel[y - IDI_WTP_ROW_OPTION_1])	*iSel = y - IDI_WTP_ROW_OPTION_1;
 		break;
 	case IDI_WTP_ROW_OPTION_4:
 		if (fCanSel[IDI_WTP_SEL_NORTH] && (x > IDI_WTP_COL_NORTH - 1) && (x < 6)) *iSel = IDI_WTP_SEL_NORTH;
@@ -813,10 +798,6 @@ void Winnie::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
 	CursorMan.showMouse(true);
 
 	for (;;) {
-		// check if tigger/mist is to be triggered
-//			if (something)
-//				event = true;
-
 		while (_vm->_system->getEventManager()->pollEvent(event)) {
 			switch(event.type) {
 			case Common::EVENT_QUIT:
@@ -1051,6 +1032,7 @@ phase2:
 
 void Winnie::drawPic(const char *szName) {
 	char szFile[256] = {0};
+	Common::File file;
 	uint8 *buffer = (uint8 *)malloc(4096);
 
 	// construct filename
@@ -1058,7 +1040,6 @@ void Winnie::drawPic(const char *szName) {
 		sprintf(szFile, "%s.pic", szName);
 	else
 		strcpy(szFile, szName);
-	Common::File file;
 	if (!file.open(szFile)) {
 		warning ("Could not open file \'%s\'", szFile);
 		return;
@@ -1074,12 +1055,11 @@ void Winnie::drawPic(const char *szName) {
 }
 
 void Winnie::drawObjPic(int iObj, int x0, int y0) {
-	WTP_OBJ_HDR	objhdr;
-	uint8 *buffer = (uint8 *)malloc(2048);
-
 	if (!iObj)
 		return;
 
+	WTP_OBJ_HDR	objhdr;
+	uint8 *buffer = (uint8 *)malloc(2048);
 	uint32 objSize = readObj(iObj, buffer);
 	parseObjHeader(&objhdr, buffer, sizeof(WTP_OBJ_HDR));
 	
diff --git a/engines/agi/preagi_winnie.h b/engines/agi/preagi_winnie.h
index 0a572796cd..2c701678ae 100644
--- a/engines/agi/preagi_winnie.h
+++ b/engines/agi/preagi_winnie.h
@@ -30,10 +30,10 @@
 
 namespace Agi {
 
-// strings
-
-#define IDS_WTP_SELECTION		">"
+#define WTP_SAVEGAME_VERSION	1
+#define IDI_XOR_KEY				0x80
 
+// strings
 #define IDS_WTP_ROOM_DOS		"rooms/rm.%02d"
 #define IDS_WTP_ROOM_AMIGA		"room.%d"
 #define IDS_WTP_ROOM_C64		"room%02d"
@@ -284,8 +284,6 @@ struct WTP_SAVE_GAME {
 	uint8	iObjRoom[IDI_WTP_MAX_ROOM_OBJ];
 };
 
-#define IDI_XOR_KEY			0x80
-
 class PreAgiEngine;
 
 class Winnie {