fixed tile crash bug

kimjoy2002 · Oct 5, 2020 · f533da3 · f533da3
1 parent d9834b3
commit f533da3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/crawl-ref/source/dungeon-feature-type.h b/crawl-ref/source/dungeon-feature-type.h
@@ -247,7 +247,6 @@ enum dungeon_feature_type
     DNGN_ENTER_VOLCANO,
     DNGN_ENTER_WIZLAB,
     DNGN_ENTER_DESOLATION,
-    DNGN_ENTER_GOLEM,
 
     DNGN_EXIT_ZIGGURAT,
     DNGN_EXIT_BAZAAR,
@@ -265,7 +264,6 @@ enum dungeon_feature_type
     DNGN_EXIT_LABYRINTH,
 #endif
     DNGN_EXIT_DESOLATION,
-    DNGN_EXIT_GOLEM,
 #if TAG_MAJOR_VERSION == 34
 
     DNGN_ALTAR_GOZAG,
@@ -297,6 +295,8 @@ enum dungeon_feature_type
     DNGN_ALTAR_AGRAPHEDE,
 #endif
     DNGN_TEMPORAL_FLOOR,
+    DNGN_ENTER_GOLEM,
+    DNGN_EXIT_GOLEM,
 
     NUM_FEATURES
 };

diff --git a/crawl-ref/source/tag-version.h b/crawl-ref/source/tag-version.h
@@ -245,6 +245,7 @@ enum tag_minor_version
     TAG_MINOR_PIPE,                // Add pipe item
     TAG_MINOR_VALOR,               // Add highst charm book
     TAG_MINOR_AID,                 // Add BOOK_AID
+    TAG_MINOR_GOLEM_BUG,            // Add GOLEM_BUG
 #endif
     NUM_TAG_MINORS,
     TAG_MINOR_VERSION = NUM_TAG_MINORS - 1

diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
@@ -1036,6 +1036,22 @@ static dungeon_feature_type rewrite_feature(dungeon_feature_type x,
         x = DNGN_ENTER_GAUNTLET;
 #endif
 
+    if (minor_version == TAG_MINOR_AID) {
+        //fixed force
+        if (x == DNGN_EXIT_ZIGGURAT) {
+            x = DNGN_ENTER_GOLEM;
+        }
+        else if (x == DNGN_ALTAR_QAZLAL) {
+            x = DNGN_EXIT_GOLEM;
+        }
+        else if (x > DNGN_ALTAR_QAZLAL) {
+            x = static_cast<dungeon_feature_type>(x - 2);
+        }
+        else if (x > DNGN_EXIT_ZIGGURAT) {
+            x = static_cast<dungeon_feature_type>(x - 1);
+        }
+    }
+
     return x;
 }