Minor tweaks

bradharding · Jul 3, 2023 · 4227a08 · 4227a08
1 parent 4343f00
commit 4227a08
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/src/p_setup.c b/src/p_setup.c
@@ -3453,18 +3453,24 @@ static bool P_ParseMapInfo(const char *scriptname)
                                 {
                                     SC_MustGetNumber();
                                     special = sc_Number;
+
                                     SC_MustGetNumber();
                                     tag = sc_Number;
 
-                                    if (tag || special == 11 || special == 51 || special == 52 || special == 124)
+                                    if (tag
+                                        || special == S1_ExitLevel
+                                        || special == S1_ExitLevel_GoesToSecretLevel
+                                        || special == W1_ExitLevel
+                                        || special == W1_ExitLevel_GoesToSecretLevel)
                                     {
                                         if (info->numbossactions == -1)
                                             info->numbossactions = 1;
                                         else
                                             info->numbossactions++;
 
-                                        info->bossactions = (bossaction_t *)realloc(info->bossactions,
+                                        info->bossactions = (bossaction_t *)I_Realloc(info->bossactions,
                                             sizeof(bossaction_t) * info->numbossactions);
+
                                         info->bossactions[info->numbossactions - 1].type = i;
                                         info->bossactions[info->numbossactions - 1].special = special;
                                         info->bossactions[info->numbossactions - 1].tag = tag;

diff --git a/src/p_switch.c b/src/p_switch.c
@@ -360,25 +360,25 @@ bool P_UseSpecialLine(mobj_t *thing, line_t *line, int side, bool bossaction)
         switch (line->special)
         {
             // 0-tag specials, locked switches and teleporters need to be blocked for boss actions.
-            case 1:         // MANUAL DOOR RAISE
-            case 32:        // MANUAL BLUE
-            case 33:        // MANUAL RED
-            case 34:        // MANUAL YELLOW
-            case 117:       // Blazing door raise
-            case 118:       // Blazing door open
-            case 133:       // BlzOpenDoor BLUE
-            case 135:       // BlzOpenDoor RED
-            case 137:       // BlzOpenDoor YEL
-
-            case 99:        // BlzOpenDoor BLUE
-            case 134:       // BlzOpenDoor RED
-            case 136:       // BlzOpenDoor YELLOW
-
-            //jff 3/5/98 add ability to use teleporters for monsters
-            case 195:       // switch teleporters
-            case 174:
-            case 210:       // silent switch teleporters
-            case 209:
+            case DR_Door_OpenWaitClose_AlsoMonsters:
+            case D1_Door_Blue_OpenStay:
+            case D1_Door_Red_OpenStay:
+            case D1_Door_Yellow_OpenStay:
+            case DR_Door_OpenWaitClose_Fast:
+            case D1_Door_OpenStay_Fast:
+            case S1_Door_Blue_OpenStay_Fast:
+            case S1_Door_Red_OpenStay_Fast:
+            case S1_Door_Yellow_OpenStay_Fast:
+
+            case SR_Door_Blue_OpenStay_Fast:
+            case SR_Door_Red_OpenStay_Fast:
+            case SR_Door_Yellow_OpenStay_Fast:
+
+            // jff 3/5/98 add ability to use teleporters for monsters
+            case SR_Teleport_AlsoMonsters:
+            case S1_Teleport_AlsoMonsters:
+            case S1_Teleport_AlsoMonsters_Silent_SameAngle:
+            case SR_Teleport_AlsoMonsters_Silent_SameAngle:
                 return false;
                 break;
         }