[Scummvm-git-logs] scummvm master -> 622614eb20502eb41910d25d2e64f861d611a6f8

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
622614eb20 AGI: Fix the Amiga Winnie the Pooh file structure and detection


Commit: 622614eb20502eb41910d25d2e64f861d611a6f8
    https://github.com/scummvm/scummvm/commit/622614eb20502eb41910d25d2e64f861d611a6f8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-05-28T15:30:45+03:00

Commit Message:
AGI: Fix the Amiga Winnie the Pooh file structure and detection

The Amiga version of Winnie has files in subdirectories. The engine has
been adapted to respect the directory structure of this version

Changed paths:
    engines/agi/detection_tables.h
    engines/agi/preagi_winnie.cpp
    engines/agi/preagi_winnie.h


diff --git a/engines/agi/detection_tables.h b/engines/agi/detection_tables.h
index cd12f1c9fd5..ddf4f3e32df 100644
--- a/engines/agi/detection_tables.h
+++ b/engines/agi/detection_tables.h
@@ -846,8 +846,8 @@ static const AGIGameDescription gameDescriptions[] = {
 							"obj.40",    "188636a4a340fcfd8e7fab1e8e0ac53b", 657, 0x0000, GID_WINNIE, Common::kPlatformDOS),
 
 	// Winnie the Pooh in the Hundred Acre Wood (Amiga)
-	GAMEpre_PO("winnie", "", "title",   "2e7900c1ccaa7671d65405f6d1efed30", 1334,
-							 "room.62", "d56297aa9a1714dc654034f8db9f05c9", 1319, 0x0000, GID_WINNIE, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
+	GAMEpre_PO("winnie", "", "misc/title",    "2e7900c1ccaa7671d65405f6d1efed30", 1334,
+							 "rooms/room.62", "d56297aa9a1714dc654034f8db9f05c9", 1319, 0x0000, GID_WINNIE, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Winnie the Pooh in the Hundred Acre Wood (C64)
 	GAMEpre_P("winnie", "", "title.pic", "d4eb97cffc866110f71e1ec9f84fe643", 4097,
diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index f3960fe53b8..839f41f4fb0 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -1066,6 +1066,8 @@ void WinnieEngine::drawPic(const char *szName) {
 
 	if (getPlatform() != Common::kPlatformAmiga)
 		fileName += ".pic";
+	else
+		fileName = "misc/" + fileName;
 
 	Common::File file;
 
diff --git a/engines/agi/preagi_winnie.h b/engines/agi/preagi_winnie.h
index 9219723a1b4..399f640b82b 100644
--- a/engines/agi/preagi_winnie.h
+++ b/engines/agi/preagi_winnie.h
@@ -29,11 +29,11 @@ namespace Agi {
 
 // strings
 #define IDS_WTP_ROOM_DOS        "rooms/rm.%02d"
-#define IDS_WTP_ROOM_AMIGA      "room.%d"
+#define IDS_WTP_ROOM_AMIGA      "rooms/room.%d"
 #define IDS_WTP_ROOM_C64        "room%02d"
 #define IDS_WTP_ROOM_APPLE      "room%d.obj"
 #define IDS_WTP_OBJ_DOS         "obj.%02d"
-#define IDS_WTP_OBJ_AMIGA       "object.%d"
+#define IDS_WTP_OBJ_AMIGA       "objects/object.%d"
 #define IDS_WTP_OBJ_C64         "object%02d"
 #define IDS_WTP_OBJ_APPLE       "object%d.obj"
 #define IDS_WTP_SND_DOS         "snd.%02d"