From f716939956e0da16d20b18ea63b5a49b4038da15 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 13 Sep 2014 05:15:05 -0400
Subject: Add vld_ prefix for vldoor_e enum values.

It was pointed out to me recently that vldoor_e has enum values
named 'open' and 'close'. These can potentially conflict with POSIX
standard functions that have the same names, if the right header
files are included.

This doesn't currently cause any problems. However, to avoid any
possibility of a conflict occurring if a different compiler is used,
add a vld_ prefix to all the enum values, to namespace them.
---
 src/strife/p_dialog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/strife/p_dialog.c')

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
-- 
cgit v1.2.3