Started finale slideshow stuff, added/tweaked quest flags, and did some

elimination of tabs in altered functions. Also refactored a few strings
to use DEH_String.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2082

1 files changed, 44 insertions, 5 deletions

diff --git a/src/strife/doomdef.h b/src/strife/doomdef.h
index 215c20f3..93cb99ed 100644
--- a/src/strife/doomdef.h
+++ b/src/strife/doomdef.h
@@ -199,10 +199,10 @@ typedef enum
 } powertype_t;
 
 // villsa [STRIFE]
-// quest flags
+// quest numbers
 typedef enum
 {
-    tk_quest1 = 1,
+    tk_quest1,
     tk_quest2,
     tk_quest3,
     tk_quest4,
@@ -233,11 +233,50 @@ typedef enum
     tk_quest29,
     tk_quest30,
     tk_quest31,
-    tk_quest32,
-    NUMQUESTS,
-    tk_allquests = 0x7fffffff
+    tk_quest32,   // most likely unused
+    tk_numquests,
 } questtype_t;
 
+// haleyjd 09/12/10: [STRIFE]
+// flag values for each quest.
+enum
+{
+    QF_QUEST1  = (1 << tk_quest1),
+    QF_QUEST2  = (1 << tk_quest2),
+    QF_QUEST3  = (1 << tk_quest3), 
+    QF_QUEST4  = (1 << tk_quest4),
+    QF_QUEST5  = (1 << tk_quest5),
+    QF_QUEST6  = (1 << tk_quest6),
+    QF_QUEST7  = (1 << tk_quest7),
+    QF_QUEST8  = (1 << tk_quest8),
+    QF_QUEST9  = (1 << tk_quest9),
+    QF_QUEST10 = (1 << tk_quest10),
+    QF_QUEST11 = (1 << tk_quest11),
+    QF_QUEST12 = (1 << tk_quest12),
+    QF_QUEST13 = (1 << tk_quest13),
+    QF_QUEST14 = (1 << tk_quest14),
+    QF_QUEST15 = (1 << tk_quest15),
+    QF_QUEST16 = (1 << tk_quest16),
+    QF_QUEST17 = (1 << tk_quest17),
+    QF_QUEST18 = (1 << tk_quest18),
+    QF_QUEST19 = (1 << tk_quest19),
+    QF_QUEST20 = (1 << tk_quest20),
+    QF_QUEST21 = (1 << tk_quest21),
+    QF_QUEST22 = (1 << tk_quest22),
+    QF_QUEST23 = (1 << tk_quest23),
+    QF_QUEST24 = (1 << tk_quest24),
+    QF_QUEST25 = (1 << tk_quest25),
+    QF_QUEST26 = (1 << tk_quest26),
+    QF_QUEST27 = (1 << tk_quest27),
+    QF_QUEST28 = (1 << tk_quest28),
+    QF_QUEST29 = (1 << tk_quest29),
+    QF_QUEST30 = (1 << tk_quest30),
+    QF_QUEST31 = (1 << tk_quest31),
+    QF_QUEST32 = (1 << tk_quest32), // note seems to be unused
+    
+    QF_ALLQUESTS  = (QF_QUEST31 + (QF_QUEST31 - 1)) // does not include bit 32!
+};
+
 //
 // Power up durations,
 //  how many seconds till expiration,