mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
************************************************************
* Merged Source Code from Development Trunk: Revision 4063 * ************************************************************ - Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP - This will be the Source for the Beta 2011 Test git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+7
-3
@@ -90,8 +90,6 @@ public:
|
||||
|
||||
// conditions
|
||||
INT16 sRequiredItem; // item NPC must have to say quote
|
||||
INT32 sRequiredGridNo; // location for NPC req'd to say quote
|
||||
|
||||
UINT16 usFactMustBeTrue; // ...before saying quote
|
||||
UINT16 usFactMustBeFalse; // ...before saying quote
|
||||
UINT8 ubQuest; // quest must be current to say quote
|
||||
@@ -99,7 +97,6 @@ public:
|
||||
UINT8 ubLastDay; // last day quote can be said
|
||||
UINT8 ubApproachRequired; // must use this approach to generate quote
|
||||
UINT8 ubOpinionRequired; // opinion needed for this quote
|
||||
UINT8 ubUnused;
|
||||
|
||||
// quote to say (if any)
|
||||
UINT8 ubQuoteNum; // this is the quote to say
|
||||
@@ -110,10 +107,17 @@ public:
|
||||
UINT8 ubEndQuest;
|
||||
UINT8 ubTriggerNPC;
|
||||
UINT8 ubTriggerNPCRec;
|
||||
UINT8 ubFiller;
|
||||
UINT16 usSetFactTrue;
|
||||
UINT16 usGiftItem; // item NPC gives to merc after saying quote
|
||||
UINT16 usUnused;
|
||||
INT16 sActionData; // special action value
|
||||
|
||||
INT32 sRequiredGridNo; // location for NPC req'd to say quote
|
||||
INT32 usGoToGridNo;
|
||||
UINT16 usSourceDialogueLevel; // reserved for future use
|
||||
UINT16 usDestDialogueLevel; // reserved for future use
|
||||
|
||||
public:
|
||||
NPCQuoteInfo& operator=(const _old_NPCQuoteInfo& src);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user