Revisions to objective macro and addition of voice with objective for

super-shortcut. Implemented A_BossDeath - needs moar testing! Resolved
conflict with p_inter.c.

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

1 files changed, 38 insertions, 38 deletions

diff --git a/src/strife/doomdef.h b/src/strife/doomdef.h
index eed24a6b..99404c45 100644
--- a/src/strife/doomdef.h
+++ b/src/strife/doomdef.h
@@ -201,39 +201,39 @@ typedef enum
 // villsa [STRIFE]
 // quest numbers
 typedef enum
-{
-    tk_quest1,
-    tk_quest2,
-    tk_quest3,
-    tk_quest4,
-    tk_quest5,
-    tk_quest6,
-    tk_quest7,
-    tk_quest8,
-    tk_quest9,
-    tk_quest10,
-    tk_quest11,
-    tk_quest12,
-    tk_quest13,
-    tk_quest14,
-    tk_quest15,
-    tk_quest16,
-    tk_quest17,
-    tk_quest18,
-    tk_quest19,
-    tk_quest20,
-    tk_quest21,
-    tk_quest22,
-    tk_quest23,
-    tk_quest24,
-    tk_quest25,
-    tk_quest26,
-    tk_quest27,
-    tk_quest28,
-    tk_quest29,
-    tk_quest30,
-    tk_quest31,
-    tk_quest32,   // most likely unused
+{               // Hex          Watcom Name   
+    tk_quest1,  // 0x00000001   questflags & 1
+    tk_quest2,  // 0x00000002   questflags & 2
+    tk_quest3,  // 0x00000004   questflags & 4
+    tk_quest4,  // 0x00000008   questflags & 8
+    tk_quest5,  // 0x00000010   questflags & 10h
+    tk_quest6,  // 0x00000020   questflags & 20h
+    tk_quest7,  // 0x00000040   questflags & 40h
+    tk_quest8,  // 0x00000080   questflags & 80h
+    tk_quest9,  // 0x00000100   BYTE1(questflags) & 1
+    tk_quest10, // 0x00000200   BYTE1(questflags) & 2
+    tk_quest11, // 0x00000400   BYTE1(questflags) & 4
+    tk_quest12, // 0x00000800   BYTE1(questflags) & 8
+    tk_quest13, // 0x00001000   BYTE1(questflags) & 10h
+    tk_quest14, // 0x00002000   BYTE1(questflags) & 20h
+    tk_quest15, // 0x00004000   BYTE1(questflags) & 40h
+    tk_quest16, // 0x00008000   BYTE1(questflags) & 80h
+    tk_quest17, // 0x00010000   BYTE2(questflags) & 1
+    tk_quest18, // 0x00020000   BYTE2(questflags) & 2
+    tk_quest19, // 0x00040000   BYTE2(questflags) & 4
+    tk_quest20, // 0x00080000   BYTE2(questflags) & 8
+    tk_quest21, // 0x00100000   BYTE2(questflags) & 10h
+    tk_quest22, // 0x00200000   BYTE2(questflags) & 20h
+    tk_quest23, // 0x00400000   BYTE2(questflags) & 40h
+    tk_quest24, // 0x00800000   BYTE2(questflags) & 80h
+    tk_quest25, // 0x01000000   BYTE3(questflags) & 1
+    tk_quest26, // 0x02000000   BYTE3(questflags) & 2
+    tk_quest27, // 0x04000000   BYTE3(questflags) & 4
+    tk_quest28, // 0x08000000   BYTE3(questflags) & 8
+    tk_quest29, // 0x10000000   BYTE3(questflags) & 10h
+    tk_quest30, // 0x20000000   BYTE3(questflags) & 20h
+    tk_quest31, // 0x40000000   BYTE3(questflags) & 40h
+    tk_quest32, // most likely unused
     tk_numquests
 } questtype_t;
 
@@ -261,12 +261,12 @@ enum
     QF_QUEST18 = (1 << tk_quest18), // Obtained Oracle Pass
     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_QUEST21 = (1 << tk_quest21), // Killed Bishop - TODO: verify!
+    QF_QUEST22 = (1 << tk_quest22), // Killed Oracle with QUEST21 set
+    QF_QUEST23 = (1 << tk_quest23), // Killed Oracle (always given)
+    QF_QUEST24 = (1 << tk_quest24), // Killed Macil
     QF_QUEST25 = (1 << tk_quest25), // Destroyed the Converter
-    QF_QUEST26 = (1 << tk_quest26),
+    QF_QUEST26 = (1 << tk_quest26), // Killed Loremaster
     QF_QUEST27 = (1 << tk_quest27),
     QF_QUEST28 = (1 << tk_quest28),
     QF_QUEST29 = (1 << tk_quest29), // Destroyed the Mines Transmitter