From 994d69c7fb2c91017d4e0f10fd3cf4ea9e532565 Mon Sep 17 00:00:00 2001
From: Samuel Villareal
Date: Wed, 8 Sep 2010 04:04:50 +0000
Subject: + Update to mapdialog struct + P_StartDialog updated

Subversion-branch: /branches/strife-branch
Subversion-revision: 2038
---
 src/strife/p_dialog.h | 55 +++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

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

diff --git a/src/strife/p_dialog.h b/src/strife/p_dialog.h
index 531e3028..e544d19c 100644
--- a/src/strife/p_dialog.h
+++ b/src/strife/p_dialog.h
@@ -31,41 +31,40 @@
 #ifndef P_DIALOG_H__
 #define P_DIALOG_H__
 
-#define MDLG_CHOICELEN   32
-#define MDLG_MSGLEN      80
-#define MDLG_NAMELEN     16
-#define MDLG_LUMPLEN      8
-#define MDLG_TEXTLEN    320
-#define MDLG_MAXCHOICES   5
+#define MDLG_CHOICELEN      32
+#define MDLG_MSGLEN         80
+#define MDLG_NAMELEN        16
+#define MDLG_LUMPLEN        8
+#define MDLG_TEXTLEN        320
+#define MDLG_MAXCHOICES     5
+#define MDLG_MAXITEMS       3
 
 typedef struct mapdlgchoice_s
 {
-    int  giveitem;             // item given when successful
-    int  needitem1;            // first item needed for success
-    int  needitem2;            // second item needed for success, if any
-    int  needitem3;            // third item needed for success, if any
-    int  needamount1;          // amount of first item needed
-    int  needamount2;          // amount of second item needed
-    int  needamount3;          // amount of third item needed
-    char text[MDLG_CHOICELEN]; // normal text
-    char textok[MDLG_MSGLEN];  // message given on success
-    int next;                  // next dialog?
-    int objective;             // ???
-    char textno[MDLG_MSGLEN];  // message given on failure
+    int  giveitem;                  // item given when successful
+    int  needitem1;                 // first item needed for success
+    int  needitem2;                 // second item needed for success, if any
+    int  needitem3;                 // third item needed for success, if any
+    int  needamount1;               // amount of first item needed
+    int  needamount2;               // amount of second item needed
+    int  needamount3;               // amount of third item needed
+    char text[MDLG_CHOICELEN];      // normal text
+    char textok[MDLG_MSGLEN];       // message given on success
+    int next;                       // next dialog?
+    int objective;                  // ???
+    char textno[MDLG_MSGLEN];       // message given on failure
 } mapdlgchoice_t;
 
 typedef struct mapdialog_s
 {
-    int speakerid;  // script ID# for mobjtype that will use this dialog
-    int dropitem;   // item to drop if that thingtype is killed
-    int checkitem1; // first item needed to see this dialog
-    int checkitem2; // second item needed to see this dialog, if any
-    int checkitem3; // third item needed to see this dialog, if any
-    int jumptoconv; // conversation to jump to when... ?
-    char name[MDLG_NAMELEN];    // name of speaker
-    char voice[MDLG_LUMPLEN];   // voice file to play
-    char backpic[MDLG_LUMPLEN]; // backdrop pic for character, if any
-    char text[MDLG_TEXTLEN];    // main message text
+    int speakerid;                  // script ID# for mobjtype that will use this dialog
+    int dropitem;                   // item to drop if that thingtype is killed
+    int checkitem[MDLG_MAXITEMS];   // item(s) needed to see this dialog
+    int jumptoconv;                 // conversation to jump to when... ?
+    char name[MDLG_NAMELEN];        // name of speaker
+    char voice[MDLG_LUMPLEN];       // voice file to play
+    char backpic[MDLG_LUMPLEN];     // backdrop pic for character, if any
+    char text[MDLG_TEXTLEN];        // main message text
     
     // options that this dialog gives the player
     mapdlgchoice_t choices[MDLG_MAXCHOICES];
-- 
cgit v1.2.3