diff options
Diffstat (limited to 'src/strife')
| -rw-r--r-- | src/strife/p_dialog.c | 8 | ||||
| -rw-r--r-- | src/strife/p_doors.c | 76 | ||||
| -rw-r--r-- | src/strife/p_enemy.c | 6 | ||||
| -rw-r--r-- | src/strife/p_inter.c | 8 | ||||
| -rw-r--r-- | src/strife/p_spec.c | 38 | ||||
| -rw-r--r-- | src/strife/p_spec.h | 22 | ||||
| -rw-r--r-- | src/strife/p_switch.c | 50 |
7 files changed, 104 insertions, 104 deletions
diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c index 3c705dfe..804084e4 100644 --- a/src/strife/p_dialog.c +++ b/src/strife/p_dialog.c @@ -918,24 +918,24 @@ boolean P_GiveItemToPlayer(player_t *player, int sprnum, mobjtype_t type) case MT_TOKEN_DOOR1: // Door special 1
junk.tag = 222;
- EV_DoDoor(&junk, open);
+ EV_DoDoor(&junk, vld_open);
break;
case MT_TOKEN_PRISON_PASS: // Door special 1 - Prison pass
junk.tag = 223;
- EV_DoDoor(&junk, open);
+ EV_DoDoor(&junk, vld_open);
if(gamemap == 2) // If on Tarnhill, give Prison pass object
P_GiveInventoryItem(player, sprnum, type);
break;
case MT_TOKEN_SHOPCLOSE: // Door special 3 - "Shop close" - unused?
junk.tag = 222;
- EV_DoDoor(&junk, close);
+ EV_DoDoor(&junk, vld_close);
break;
case MT_TOKEN_DOOR3: // Door special 4 (or 3? :P )
junk.tag = 224;
- EV_DoDoor(&junk, close);
+ EV_DoDoor(&junk, vld_close);
break;
case MT_TOKEN_STAMINA: // Stamina upgrade
diff --git a/src/strife/p_doors.c b/src/strife/p_doors.c index 8f742905..30f6e311 100644 --- a/src/strife/p_doors.c +++ b/src/strife/p_doors.c @@ -58,25 +58,25 @@ void T_VerticalDoor(vldoor_t* door) { switch(door->type) { - case blazeRaise: + case vld_blazeRaise: door->direction = -1; // time to go back down S_StartSound(&door->sector->soundorg, sfx_bdcls); break; - case normal: + case vld_normal: door->direction = -1; // time to go back down // villsa [STRIFE] closesound added S_StartSound(&door->sector->soundorg, door->closesound); break; // villsa [STRIFE] - case shopClose: + case vld_shopClose: door->direction = 1; door->speed = (2*FRACUNIT); S_StartSound(&door->sector->soundorg, door->opensound); break; - case close30ThenOpen: + case vld_close30ThenOpen: door->direction = 1; // villsa [STRIFE] opensound added @@ -95,9 +95,9 @@ void T_VerticalDoor(vldoor_t* door) { switch(door->type) { - case raiseIn5Mins: + case vld_raiseIn5Mins: door->direction = 1; - door->type = normal; + door->type = vld_normal; // villsa [STRIFE] opensound added S_StartSound(&door->sector->soundorg, door->opensound); @@ -130,22 +130,22 @@ void T_VerticalDoor(vldoor_t* door) { switch(door->type) { - case normal: - case close: - case blazeRaise: - case blazeClose: + case vld_normal: + case vld_close: + case vld_blazeRaise: + case vld_blazeClose: door->sector->specialdata = NULL; P_RemoveThinker (&door->thinker); // unlink and free // villsa [STRIFE] no sounds break; - case close30ThenOpen: + case vld_close30ThenOpen: door->direction = 0; door->topcountdown = TICRATE*30; break; // villsa [STRIFE] - case shopClose: + case vld_shopClose: door->direction = 0; door->topcountdown = TICRATE*120; break; @@ -158,9 +158,9 @@ void T_VerticalDoor(vldoor_t* door) { switch(door->type) { - case blazeClose: - case close: // DO NOT GO BACK UP! - case shopClose: // villsa [STRIFE] + case vld_blazeClose: + case vld_close: // DO NOT GO BACK UP! + case vld_shopClose: // villsa [STRIFE] break; default: @@ -183,16 +183,16 @@ void T_VerticalDoor(vldoor_t* door) { switch(door->type) { - case blazeRaise: - case normal: + case vld_blazeRaise: + case vld_normal: door->direction = 0; // wait at top door->topcountdown = door->topwait; break; - case close30ThenOpen: - case blazeOpen: - case open: - case shopClose: // villsa [STRIFE] + case vld_close30ThenOpen: + case vld_blazeOpen: + case vld_open: + case vld_shopClose: // villsa [STRIFE] door->sector->specialdata = NULL; P_RemoveThinker (&door->thinker); // unlink and free break; @@ -407,7 +407,7 @@ int EV_DoDoor(line_t* line, vldoor_e type) switch(type) { // villsa [STRIFE] new door type - case splitOpen: + case vld_splitOpen: door->direction = -2; door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; @@ -421,7 +421,7 @@ int EV_DoDoor(line_t* line, vldoor_e type) break; // villsa [STRIFE] new door type - case splitRaiseNearest: + case vld_splitRaiseNearest: door->direction = -2; door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; @@ -434,8 +434,8 @@ int EV_DoDoor(line_t* line, vldoor_e type) S_StartSound(&sec->soundorg, door->opensound); break; - case blazeClose: - case shopClose: // villsa [STRIFE] + case vld_blazeClose: + case vld_shopClose: // villsa [STRIFE] door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; door->direction = -1; @@ -443,7 +443,7 @@ int EV_DoDoor(line_t* line, vldoor_e type) S_StartSound(&door->sector->soundorg, sfx_bdcls); break; - case close: + case vld_close: door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; door->direction = -1; @@ -452,7 +452,7 @@ int EV_DoDoor(line_t* line, vldoor_e type) S_StartSound(&door->sector->soundorg, door->opensound); break; - case close30ThenOpen: + case vld_close30ThenOpen: door->topheight = sec->ceilingheight; door->direction = -1; @@ -460,8 +460,8 @@ int EV_DoDoor(line_t* line, vldoor_e type) S_StartSound(&door->sector->soundorg, door->closesound); break; - case blazeRaise: - case blazeOpen: + case vld_blazeRaise: + case vld_blazeOpen: door->direction = 1; door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; @@ -470,8 +470,8 @@ int EV_DoDoor(line_t* line, vldoor_e type) S_StartSound(&door->sector->soundorg, sfx_bdopn); break; - case normal: - case open: + case vld_normal: + case vld_open: door->direction = 1; door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; @@ -826,7 +826,7 @@ void EV_VerticalDoor(line_t* line, mobj_t* thing) case 26: case 27: case 28: - door->type = normal; + door->type = vld_normal; break; case 31: @@ -836,24 +836,24 @@ void EV_VerticalDoor(line_t* line, mobj_t* thing) case 156: // villsa [STRIFE] case 157: // villsa [STRIFE] case 158: // villsa [STRIFE] - door->type = open; + door->type = vld_open; line->special = 0; break; case 117: // blazing door raise - door->type = blazeRaise; + door->type = vld_blazeRaise; door->speed = VDOORSPEED*4; break; case 118: // blazing door open - door->type = blazeOpen; + door->type = vld_blazeOpen; line->special = 0; door->speed = VDOORSPEED*4; break; default: // haleyjd: [STRIFE] pretty important to have this here! - door->type = normal; + door->type = vld_normal; break; } @@ -880,7 +880,7 @@ void P_SpawnDoorCloseIn30 (sector_t* sec) door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor; door->sector = sec; door->direction = 0; - door->type = normal; + door->type = vld_normal; door->speed = VDOORSPEED; door->topcountdown = 30 * TICRATE; } @@ -905,7 +905,7 @@ P_SpawnDoorRaiseIn5Mins door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor; door->sector = sec; door->direction = 2; - door->type = raiseIn5Mins; + door->type = vld_raiseIn5Mins; door->speed = VDOORSPEED; door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; diff --git a/src/strife/p_enemy.c b/src/strife/p_enemy.c index 2238ebf9..e3757ac7 100644 --- a/src/strife/p_enemy.c +++ b/src/strife/p_enemy.c @@ -2333,7 +2333,7 @@ void A_HideZombie(mobj_t* actor) line_t junk; junk.tag = 999; - EV_DoDoor(&junk, blazeClose); + EV_DoDoor(&junk, vld_blazeClose); if(actor->target && actor->target->player) P_NoiseAlert(actor->target, actor); // inlined in asm @@ -2351,7 +2351,7 @@ void A_MerchantPain(mobj_t* actor) line_t junk; junk.tag = 999; - EV_DoDoor(&junk, shopClose); + EV_DoDoor(&junk, vld_shopClose); if(actor->target && actor->target->player) P_NoiseAlert(actor->target, actor); // inlined in asm @@ -3018,7 +3018,7 @@ void A_BossDeath (mobj_t* actor) GiveVoiceObjective("VOC87", "LOG87", 0); } junk.tag = 222; // Open the exit door again; - EV_DoDoor(&junk, open); // Note this is NOT the Loremaster door... + EV_DoDoor(&junk, vld_open); // Note this is NOT the Loremaster door... break; case MT_SPECTRE_D: diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index d691947e..857f4e13 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -939,7 +939,7 @@ void P_KillMobj(mobj_t* source, mobj_t* target) case MT_COUPLING: junk.tag = 225; - EV_DoDoor(&junk, close); + EV_DoDoor(&junk, vld_close); junk.tag = 44; EV_DoFloor(&junk, lowerFloor); @@ -960,7 +960,7 @@ void P_KillMobj(mobj_t* source, mobj_t* target) { case MT_TOKEN_SHOPCLOSE: junk.tag = 222; - EV_DoDoor(&junk, close); + EV_DoDoor(&junk, vld_close); P_NoiseAlert(players[0].mo, players[0].mo); M_snprintf(plrkilledmsg, sizeof(plrkilledmsg), @@ -972,12 +972,12 @@ void P_KillMobj(mobj_t* source, mobj_t* target) case MT_TOKEN_PRISON_PASS: junk.tag = 223; - EV_DoDoor(&junk, open); + EV_DoDoor(&junk, vld_open); return; case MT_TOKEN_DOOR3: junk.tag = 224; - EV_DoDoor(&junk, open); + EV_DoDoor(&junk, vld_open); return; case MT_SIGIL_A: diff --git a/src/strife/p_spec.c b/src/strife/p_spec.c index 76e37cca..30682dd3 100644 --- a/src/strife/p_spec.c +++ b/src/strife/p_spec.c @@ -648,7 +648,7 @@ P_CrossSpecialLine // fall-through: case 2: // Open Door - [STRIFE] Verified unmodified. - EV_DoDoor(line,open); + EV_DoDoor(line,vld_open); line->special = 0; break; @@ -662,13 +662,13 @@ P_CrossSpecialLine // fall-through: case 3: // Close Door - [STRIFE] Verified unmodified. - EV_DoDoor(line,close); + EV_DoDoor(line,vld_close); line->special = 0; break; case 4: // Raise Door - [STRIFE] Verified unmodified. - EV_DoDoor(line,normal); + EV_DoDoor(line,vld_normal); line->special = 0; break; @@ -710,7 +710,7 @@ P_CrossSpecialLine case 16: // Close Door 30 - [STRIFE] Verified unmodified. - EV_DoDoor(line,close30ThenOpen); + EV_DoDoor(line,vld_close30ThenOpen); line->special = 0; break; @@ -848,13 +848,13 @@ P_CrossSpecialLine case 108: // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified. - EV_DoDoor (line,blazeRaise); + EV_DoDoor (line,vld_blazeRaise); line->special = 0; break; case 109: // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified. - EV_DoDoor (line,blazeOpen); + EV_DoDoor (line,vld_blazeOpen); line->special = 0; break; @@ -871,7 +871,7 @@ P_CrossSpecialLine // fall-through: case 110: // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified. - EV_DoDoor (line,blazeClose); + EV_DoDoor (line,vld_blazeClose); line->special = 0; break; @@ -918,13 +918,13 @@ P_CrossSpecialLine case 174: // villsa [STRIFE] Split Open - EV_DoDoor(line, splitOpen); + EV_DoDoor(line, vld_splitOpen); line->special = 0; break; case 183: // villsa [STRIFE] Split Raise Nearest - EV_DoDoor(line, splitRaiseNearest); + EV_DoDoor(line, vld_splitRaiseNearest); line->special = 0; break; @@ -967,7 +967,7 @@ P_CrossSpecialLine // Destroyed) if(!(thing->player->questflags & QF_QUEST16)) break; - EV_DoDoor(line, open); + EV_DoDoor(line, vld_open); line->special = 0; break; @@ -984,7 +984,7 @@ P_CrossSpecialLine // haleyjd 09/21/10: [STRIFE] W1 Open Door if Sigil Owned if(!(thing->player->weaponowned[wp_sigil])) break; - EV_DoDoor(line, open); + EV_DoDoor(line, vld_open); line->special = 0; break; @@ -1124,12 +1124,12 @@ P_CrossSpecialLine case 75: // Close Door - [STRIFE] Verified unmodified. - EV_DoDoor(line,close); + EV_DoDoor(line,vld_close); break; case 76: // Close Door 30 - [STRIFE] Verified unmodified. - EV_DoDoor(line,close30ThenOpen); + EV_DoDoor(line,vld_close30ThenOpen); break; case 77: @@ -1169,7 +1169,7 @@ P_CrossSpecialLine case 86: // Open Door - [STRIFE] Verified unmodified. - EV_DoDoor(line,open); + EV_DoDoor(line,vld_open); break; case 87: @@ -1197,7 +1197,7 @@ P_CrossSpecialLine // fall-through: case 90: // Raise Door - [STRIFE] Verified unmodified. - EV_DoDoor(line,normal); + EV_DoDoor(line,vld_normal); break; case 91: @@ -1246,17 +1246,17 @@ P_CrossSpecialLine case 105: // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified. - EV_DoDoor (line,blazeRaise); + EV_DoDoor (line,vld_blazeRaise); break; case 106: // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified. - EV_DoDoor (line,blazeOpen); + EV_DoDoor (line,vld_blazeOpen); break; case 107: // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified. - EV_DoDoor (line,blazeClose); + EV_DoDoor (line,vld_blazeClose); break; case 120: @@ -1438,7 +1438,7 @@ P_ShootSpecialLine case 46: // OPEN DOOR - [STRIFE] Verified unmodified. - EV_DoDoor(line,open); + EV_DoDoor(line,vld_open); P_ChangeSwitchTexture(line,1); break; diff --git a/src/strife/p_spec.h b/src/strife/p_spec.h index 50b451ba..684386af 100644 --- a/src/strife/p_spec.h +++ b/src/strife/p_spec.h @@ -339,17 +339,17 @@ void P_ActivateInStasis(int tag); // typedef enum { - normal, - close30ThenOpen, - close, - open, - raiseIn5Mins, - blazeRaise, - blazeOpen, - blazeClose, - shopClose, // villsa [STRIFE] - splitRaiseNearest, // villsa [STRIFE] - splitOpen // villsa [STRIFE] + vld_normal, + vld_close30ThenOpen, + vld_close, + vld_open, + vld_raiseIn5Mins, + vld_blazeRaise, + vld_blazeOpen, + vld_blazeClose, + vld_shopClose, // villsa [STRIFE] + vld_splitRaiseNearest, // villsa [STRIFE] + vld_splitOpen // villsa [STRIFE] } vldoor_e; diff --git a/src/strife/p_switch.c b/src/strife/p_switch.c index d476c84a..da345e86 100644 --- a/src/strife/p_switch.c +++ b/src/strife/p_switch.c @@ -576,13 +576,13 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 29: // Raise Door - [STRIFE] Verified unmodified - if (EV_DoDoor(line,normal)) + if (EV_DoDoor(line,vld_normal)) P_ChangeSwitchTexture(line,0); break; case 40: // villsa [STRIFE] Split Open Door - if(EV_DoDoor(line, splitOpen)) + if(EV_DoDoor(line, vld_splitOpen)) P_ChangeSwitchTexture(line, 0); break; // haleyjd @@ -594,7 +594,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 42: // Close Door - [STRIFE] Verified unmodified - if (EV_DoDoor(line,close)) + if (EV_DoDoor(line,vld_close)) P_ChangeSwitchTexture(line,1); break; @@ -618,7 +618,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 50: // Close Door - [STRIFE] Verified unmodified - if (EV_DoDoor(line,close)) + if (EV_DoDoor(line,vld_close)) P_ChangeSwitchTexture(line,0); break; @@ -642,7 +642,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 61: // Open Door - [STRIFE] Verified unmodified - if (EV_DoDoor(line,open)) + if (EV_DoDoor(line,vld_open)) P_ChangeSwitchTexture(line,1); break; @@ -654,7 +654,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 63: // Raise Door - [STRIFE] Verified unmodified - if (EV_DoDoor(line,normal)) + if (EV_DoDoor(line,vld_normal)) P_ChangeSwitchTexture(line,1); break; @@ -720,43 +720,43 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 103: // Open Door - [STRIFE] Verified unmodified - if (EV_DoDoor(line,open)) + if (EV_DoDoor(line,vld_open)) P_ChangeSwitchTexture(line,0); break; case 111: // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified - if (EV_DoDoor (line,blazeRaise)) + if (EV_DoDoor (line,vld_blazeRaise)) P_ChangeSwitchTexture(line,0); break; case 112: // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified - if (EV_DoDoor (line,blazeOpen)) + if (EV_DoDoor (line,vld_blazeOpen)) P_ChangeSwitchTexture(line,0); break; case 113: // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified - if (EV_DoDoor (line,blazeClose)) + if (EV_DoDoor (line,vld_blazeClose)) P_ChangeSwitchTexture(line,0); break; case 114: // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified - if (EV_DoDoor (line,blazeRaise)) + if (EV_DoDoor (line,vld_blazeRaise)) P_ChangeSwitchTexture(line,1); break; case 115: // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified - if (EV_DoDoor (line,blazeOpen)) + if (EV_DoDoor (line,vld_blazeOpen)) P_ChangeSwitchTexture(line,1); break; case 116: // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified - if (EV_DoDoor (line,blazeClose)) + if (EV_DoDoor (line,vld_blazeClose)) P_ChangeSwitchTexture(line,1); break; @@ -793,14 +793,14 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 133: // [STRIFE] TODO - which key is it? case 135: // [STRIFE] TODO - which key is it? case 137: // [STRIFE] TODO - which key is it? - if (EV_DoLockedDoor (line,blazeOpen,thing)) + if (EV_DoLockedDoor (line,vld_blazeOpen,thing)) P_ChangeSwitchTexture(line,0); break; case 99: // [STRIFE] TODO: which key is it? case 134: // [STRIFE] TODO: which key is it? case 136: // [STRIFE] TODO: which key is it? - if (EV_DoLockedDoor (line,blazeOpen,thing)) + if (EV_DoLockedDoor (line,vld_blazeOpen,thing)) P_ChangeSwitchTexture(line,1); break; @@ -848,7 +848,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 151: // villsa [STRIFE] BlzOpenDoor Gold key case 152: // [STRIFE] TODO: which key is it? case 153: // [STRIFE] TODO: which key is it? - if(EV_DoLockedDoor(line, blazeOpen, thing)) + if(EV_DoLockedDoor(line, vld_blazeOpen, thing)) P_ChangeSwitchTexture(line, 1); break; @@ -876,19 +876,19 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 163: // [STRIFE] TODO: which key is it? case 164: // villsa [STRIFE] BlzOpenDoor Gold key case 167: // [STRIFE] TODO: which key is it? - if(EV_DoLockedDoor(line, blazeOpen, thing)) + if(EV_DoLockedDoor(line, vld_blazeOpen, thing)) P_ChangeSwitchTexture(line, 0); break; case 168: // [STRIFE] TODO: which key is it? // haleyjd 09/25/10: [STRIFE] SR Blaze Open Door ???? Key - if(EV_DoLockedDoor(line, blazeOpen, thing)) + if(EV_DoLockedDoor(line, vld_blazeOpen, thing)) P_ChangeSwitchTexture(line, 1); break; case 171: // [STRIFE] TODO: which key is it? // haleyjd 09/25/10: [STRIFE] S1 Open Door ???? Key - if(EV_DoLockedDoor(line, open, thing)) + if(EV_DoLockedDoor(line, vld_open, thing)) P_ChangeSwitchTexture(line, 0); break; @@ -898,7 +898,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 191: // [STRIFE] TODO: which key is it? case 192: // [STRIFE] TODO: which key is it? case 223: // [STRIFE] TODO: which key is it? - if(EV_DoLockedDoor(line, normal, thing)) + if(EV_DoLockedDoor(line, vld_normal, thing)) P_ChangeSwitchTexture(line, 1); break; @@ -924,13 +924,13 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 189: // [STRIFE] TODO: which key is it??? // haleyjd 09/25/10: [STRIFE] S1 Split Open Door ???? Key - if(EV_DoLockedDoor(line, splitOpen, thing)) + if(EV_DoLockedDoor(line, vld_splitOpen, thing)) P_ChangeSwitchTexture(line, 0); break; case 194: // villsa [STRIFE] S1 Free Prisoners - if(EV_DoDoor(line, open)) + if(EV_DoDoor(line, vld_open)) { P_ChangeSwitchTexture(line, 0); P_FreePrisoners(); @@ -1028,7 +1028,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) case 233: // villsa [STRIFE] objective given after revealing the computer - if(!EV_DoDoor(line, splitOpen)) + if(!EV_DoDoor(line, vld_splitOpen)) return true; P_ChangeSwitchTexture(line, 1); @@ -1051,7 +1051,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) "That doesn't seem to work!"); thing->player->message = usemessage; } - else if(EV_DoDoor(line, normal)) + else if(EV_DoDoor(line, vld_normal)) P_ChangeSwitchTexture(line, 1); break; @@ -1059,7 +1059,7 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side) // haleyjd 09/25/10: [STRIFE] S1 Split Open Door if Have Sigil 4 if(thing->player->sigiltype == 4) { - if(EV_DoDoor(line, splitOpen)) + if(EV_DoDoor(line, vld_splitOpen)) P_ChangeSwitchTexture(line, 0); } break; |