[Scummvm-git-logs] scummvm master -> b03de4b2253ec89aadec3d0d4a3fdaf0e6faf8df
dreammaster
noreply at scummvm.org
Sat Aug 8 07:02:43 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
d1833d7257 MADS: Fixed shadowed room ptr in anim functions
78f6e1d41e MADS: Janitorial
b03de4b225 MADS: PHANTOM: Fix room 113 action defines
Commit: d1833d7257ac2446d09266619f250ad75f6a3052
https://github.com/scummvm/scummvm/commit/d1833d7257ac2446d09266619f250ad75f6a3052
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-08T16:38:52+10:00
Commit Message:
MADS: Fixed shadowed room ptr in anim functions
Changed paths:
engines/mads/core/anim.cpp
engines/mads/core/anim.h
diff --git a/engines/mads/core/anim.cpp b/engines/mads/core/anim.cpp
index 6af4574f2b8..f349fdf2733 100644
--- a/engines/mads/core/anim.cpp
+++ b/engines/mads/core/anim.cpp
@@ -103,7 +103,7 @@ void SegmentInter::load(Common::SeekableReadStream *src) {
int anim_load_background(AnimFile *anim_in, Buffer *this_orig,
Buffer *this_depth, TileMapHeader *pictureMap, TileMapHeader *depthMap,
TileResource *pictureResource, TileResource *depthResource,
- RoomPtr *room, CycleListPtr cycle_list, int load_flags, int star_search) {
+ RoomPtr *roomPtr, CycleListPtr cycle_list, int load_flags, int star_search) {
int error_flag;
char temp_buf[80];
RoomPtr my_room = NULL;
@@ -193,7 +193,7 @@ int anim_load_background(AnimFile *anim_in, Buffer *this_orig,
if (pictureMap != NULL) tile_map_free(depthMap);
}
- if (room != NULL) *room = my_room;
+ if (roomPtr != NULL) *roomPtr = my_room;
return error_flag;
}
@@ -224,7 +224,7 @@ void anim_unload(AnimPtr anim) {
AnimPtr anim_load(const char *file_name, Buffer *orig, Buffer *depth,
TileMapHeader *pictureMap, TileMapHeader *depthMap,
TileResource *pictureResource, TileResource *depthResource,
- RoomPtr *room, CycleListPtr cycle_list, int load_flags) {
+ RoomPtr *roomPtr, CycleListPtr cycle_list, int load_flags) {
int count;
int error_flag = true;
int star_search;
@@ -273,7 +273,7 @@ AnimPtr anim_load(const char *file_name, Buffer *orig, Buffer *depth,
orig, depth,
pictureMap, depthMap,
pictureResource, depthResource,
- room, cycle_list,
+ roomPtr, cycle_list,
load_flags, star_search)) {
anim_error = 20000 + room_load_error;
goto done;
diff --git a/engines/mads/core/anim.h b/engines/mads/core/anim.h
index 537b7830707..c5cf87b75f3 100644
--- a/engines/mads/core/anim.h
+++ b/engines/mads/core/anim.h
@@ -432,7 +432,7 @@ int anim_load_background(AnimFile *anim_in,
TileMapHeader *depth_map,
TileResource *picture_resource,
TileResource *depth_resource,
- RoomPtr *room,
+ RoomPtr *roomPtr,
CycleListPtr cycle_list,
int load_flags, int star_search);
@@ -445,7 +445,7 @@ AnimPtr anim_load(const char *file_name,
TileMapHeader *depth_map,
TileResource *picture_resource,
TileResource *depth_resource,
- RoomPtr *room, CycleListPtr cycle_list,
+ RoomPtr *roomPtr, CycleListPtr cycle_list,
int load_flags);
int anim_get_sound_info(const char *file_name, char *sound_file_buffer,
Commit: 78f6e1d41e6f4ed45db820f796da05f080e7f462
https://github.com/scummvm/scummvm/commit/78f6e1d41e6f4ed45db820f796da05f080e7f462
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-08T17:01:17+10:00
Commit Message:
MADS: Janitorial
Changed paths:
engines/mads/core/general.h
engines/mads/phantom/main.cpp
diff --git a/engines/mads/core/general.h b/engines/mads/core/general.h
index 4292ba3b487..798afd0ee40 100644
--- a/engines/mads/core/general.h
+++ b/engines/mads/core/general.h
@@ -112,10 +112,6 @@ extern long _timer_clock;
/* logical defines (boolean etc) */
#define yes true //(-1)
#define no false //0
-#if 0
-#define true (-1)
-#define false 0
-#endif
constexpr int none = 0;
constexpr int stop = 99;
diff --git a/engines/mads/phantom/main.cpp b/engines/mads/phantom/main.cpp
index 6e8b47a736b..abed2d1ce5e 100644
--- a/engines/mads/phantom/main.cpp
+++ b/engines/mads/phantom/main.cpp
@@ -198,38 +198,6 @@ static void game_main(int argc, const char **argv) {
art_hags_are_on_hd = false;
}
-#if 0
- if (config_file.cd_version_installed) {
- strcpy(temp_buf_2, "x:\\forest.exe");
- temp_buf_2[0] = env_cd_drive;
- if (!fileio_exist(temp_buf_2)) {
- problem();
- printf("Please throw the Once Upon A Forest CD into drive %c:\n", (char)env_cd_drive);
- printf("and type 'OUAF'. If your CD-ROM drive letter has changed, run\n");
- printf("INSTALL to reconfigure this option.\n\n");
- goto done;
- }
- }
-
- if (!fileio_exist("config.for")) {
- problem();
- printf("Before you can run Once Upon A Forest, you need to run 'INSTALL' to configure\n");
- printf("the game for you your hardware. Type 'INSTALL' and hit 'ENTER' when you have\n");
- printf("finished reading this.\n\n");
- goto done;
- }
-
- mem_you_got = mem_used + mem_avail_at_start;
-
- if (mem_you_got < 569000) {
- need_to_free = 569000 - mem_you_got;
- problem();
- printf("You need at least 588,000 bytes of conventional memory to play\n");
- printf("Once Upon A Forest. You'll need to free up another %6ld bytes.\n\n", need_to_free);
- /* printf("to play this game.\n\n"); */
- goto done;
- }
-#endif
himem_startup();
himem_shutdown();
Commit: b03de4b2253ec89aadec3d0d4a3fdaf0e6faf8df
https://github.com/scummvm/scummvm/commit/b03de4b2253ec89aadec3d0d4a3fdaf0e6faf8df
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-08T17:02:01+10:00
Commit Message:
MADS: PHANTOM: Fix room 113 action defines
Assisted-by: Claude Code:claude-opus-4.8
Changed paths:
engines/mads/phantom/rooms/room113.cpp
engines/mads/phantom/rooms/room113.h
diff --git a/engines/mads/phantom/rooms/room113.cpp b/engines/mads/phantom/rooms/room113.cpp
index 264d2a37a6e..76b0a9c0a53 100644
--- a/engines/mads/phantom/rooms/room113.cpp
+++ b/engines/mads/phantom/rooms/room113.cpp
@@ -1030,14 +1030,9 @@ static void process_conversation_florent() {
global[stop_walker_disabled] = false;
break;
-#if 0
- // TODO: This case was mapped to a second "case 80" in the release executable, and can
- // never be reached. Need to see if the label "ROOM_113_HOLD_HAND", which is 98, is
- // legitimate, and this case can be re-enabled
case ROOM_113_HOLD_HAND:
local->florent_action = CONV4_FLORENT_HOLD_HAND;
break;
-#endif
case ROOM_113_MADE_IT_TO_FLORENT:
global[stop_walker_disabled] = true;
diff --git a/engines/mads/phantom/rooms/room113.h b/engines/mads/phantom/rooms/room113.h
index 5f01ec617d7..1cbf4c65c0c 100644
--- a/engines/mads/phantom/rooms/room113.h
+++ b/engines/mads/phantom/rooms/room113.h
@@ -141,9 +141,9 @@ struct Scratch { /* Room local variables */
/* Process_conversation_florent triggers */
#define ROOM_113_RAOUL_START_TALKING 62
-#define ROOM_113_FLORENT_START_TALKING2 64
+#define ROOM_113_FLORENT_START_TALKING2 66
#define ROOM_113_FLORENT_START_TALKING 66
-#define ROOM_113_MADE_IT_TO_FLORENT 78
+#define ROOM_113_MADE_IT_TO_FLORENT 94
#define ROOM_113_AT_COUCH 80
#define ROOM_113_BEFORE_COUCH 82
#define ROOM_113_BETWEEN_COUCH 84
@@ -154,11 +154,11 @@ struct Scratch { /* Room local variables */
#define ROOM_113_END_HOLD_HAND 100
/* Process_conversation_love triggers */
-#define ROOM_113_CHECK_FOR_ARMS_OUT 70 //89
-#define ROOM_113_DAY_START_TALKING 66 //91
-#define ROOM_113_WAIT_TO_SIT 78 //93
-#define ROOM_113_CHECK_FOR_AFTER_KISS 72 //95
-#define ROOM_113_HOLD_OPTIONS 76 //97
+#define ROOM_113_CHECK_FOR_ARMS_OUT 70
+#define ROOM_113_DAY_START_TALKING 66
+#define ROOM_113_WAIT_TO_SIT 78
+#define ROOM_113_CHECK_FOR_AFTER_KISS 72
+#define ROOM_113_HOLD_OPTIONS 76
/* ========================= Player positions ====================== */
@@ -181,8 +181,8 @@ struct Scratch { /* Room local variables */
#define CORPSE_X 175
#define CORPSE_Y 128
-#define FLORENT_TOUCH_HAND_X 142
-#define FLORENT_TOUCH_HAND_Y 68
+#define FLORENT_TOUCH_HAND_X 68
+#define FLORENT_TOUCH_HAND_Y 142
/* ========================= Florent dynamic hotspot =============== */
More information about the Scummvm-git-logs
mailing list