Common: cut out deprecated RoomOptions::SaveLoadDisabled

adventuregamestudio · Oct 24, 2023 · 98c9504 · 98c9504
1 parent fc5cec3
commit 98c9504
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 17 deletions.
diff --git a/Common/game/room_file.cpp b/Common/game/room_file.cpp
@@ -184,7 +184,7 @@ HError ReadMainBlock(RoomStruct *room, Stream *in, RoomFileVersion data_ver)
 
     in->Seek(LEGACY_ROOM_PASSWORD_LENGTH); // skip password
     in->ReadInt8();// [DEPRECATED]
-    room->Options.SaveLoadDisabled = in->ReadInt8() != 0;
+    in->ReadInt8();// [DEPRECATED]
     room->Options.PlayerCharOff = in->ReadInt8() != 0;
     room->Options.PlayerView = in->ReadInt8();
     in->ReadInt8();// [DEPRECATED]
@@ -530,7 +530,7 @@ void WriteMainBlock(const RoomStruct *room, Stream *out)
 
     out->WriteByteCount(0, LEGACY_ROOM_PASSWORD_LENGTH);
     out->WriteInt8(0);// [DEPRECATED]
-    out->WriteInt8(room->Options.SaveLoadDisabled ? 1 : 0);
+    out->WriteInt8(0);// [DEPRECATED]
     out->WriteInt8(room->Options.PlayerCharOff ? 1 : 0);
     out->WriteInt8(room->Options.PlayerView);
     out->WriteInt8(0);// [DEPRECATED]

diff --git a/Common/game/roomstruct.cpp b/Common/game/roomstruct.cpp
@@ -23,8 +23,7 @@ namespace Common
 {
 
 RoomOptions::RoomOptions()
-    : SaveLoadDisabled(false)
-    , PlayerCharOff(false)
+    : PlayerCharOff(false)
     , PlayerView(0)
     , Flags(0)
 {

diff --git a/Common/game/roomstruct.h b/Common/game/roomstruct.h
@@ -104,9 +104,6 @@ typedef std::shared_ptr<Bitmap> PBitmap;
 // Various room options
 struct RoomOptions
 {
-    // If saving and loading game is disabled in the room;
-    // this is a deprecated option that affects only built-in save/load dialogs
-    bool SaveLoadDisabled;
     // If player character is turned off in the room
     bool PlayerCharOff;
     // Apply player character's normal view when entering this room

diff --git a/Editor/AGS.Native/agsnative.cpp b/Editor/AGS.Native/agsnative.cpp
@@ -2791,7 +2791,6 @@ void convert_room_from_native(const RoomStruct &rs, Room ^room, System::Text::En
     room->LeftEdgeX = rs.Edges.Left;
     room->PlayerCharacterView = rs.Options.PlayerView;
     room->RightEdgeX = rs.Edges.Right;
-    room->SaveLoadEnabled = (rs.Options.SaveLoadDisabled == 0);
     room->ShowPlayerCharacter = (rs.Options.PlayerCharOff == 0);
     room->TopEdgeY = rs.Edges.Top;
     room->Width = rs.Width;
@@ -2905,7 +2904,6 @@ void convert_room_to_native(Room ^room, RoomStruct &rs)
 	rs.Edges.Left = room->LeftEdgeX;
 	rs.Options.PlayerView = room->PlayerCharacterView;
 	rs.Edges.Right = room->RightEdgeX;
-	rs.Options.SaveLoadDisabled = false; // [OBSOLETE]
 	rs.Options.PlayerCharOff = room->ShowPlayerCharacter ? 0 : 1;
 	rs.Edges.Top = room->TopEdgeY;
 	rs.Width = room->Width;

diff --git a/Engine/ac/game.cpp b/Engine/ac/game.cpp
@@ -399,10 +399,6 @@ const char* Game_GetSaveSlotDescription(int slnum) {
 
 void restore_game_dialog() {
     can_run_delayed_command();
-    if (thisroom.Options.SaveLoadDisabled == 1) {
-        // DisplayMessage(983); FIXME: remove deprecated SaveLoadDisabled
-        return;
-    }
     if (inside_script) {
         curscript->queue_action(ePSARestoreGameDialog, 0, "RestoreGameDialog");
         return;
@@ -420,10 +416,6 @@ bool do_restore_game_dialog() {
 }
 
 void save_game_dialog() {
-    if (thisroom.Options.SaveLoadDisabled == 1) {
-        // DisplayMessage(983); FIXME: remove deprecated SaveLoadDisabled
-        return;
-    }
     if (inside_script) {
         curscript->queue_action(ePSASaveGameDialog, 0, "SaveGameDialog");
         return;