zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Increased the StrifeTypes array to 999 entries so that custom WADs have

Browse source 
more flexibility.



SVN r131 (trunk)
This commit is contained in:
Christoph Oelckers 2006-05-19 21:31:25 +00:00
parent cf63f2c28e
commit 3431564b02
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -1,3 +1,7 @@
May 19, 2006 (Changes by Graf Zahl)
- Increased the StrifeTypes array to 999 entries so that custom WADs have
more flexibility when defining dialogs.
May 18, 2006 May 18, 2006
- Added a check against rw_havelow in the "sky hack" part of R_NewWall(). - Added a check against rw_havelow in the "sky hack" part of R_NewWall().
This prevents the front ceiling from being moved up if there has been no This prevents the front ceiling from being moved up if there has been no

2
src/p_conversation.cpp
View file

@ -65,7 +65,7 @@ TArray<FStrifeDialogueNode *> StrifeDialogues;
// to their index in the mobjinfo table. This table indexes all // to their index in the mobjinfo table. This table indexes all
// the Strife actor types in the order Strife had them and is // the Strife actor types in the order Strife had them and is
// initialized as part of the actor's setup in infodefaults.cpp. // initialized as part of the actor's setup in infodefaults.cpp.
const PClass *StrifeTypes[344]; const PClass *StrifeTypes[999];
static menu_t ConversationMenu; static menu_t ConversationMenu;
static TArray<menuitem_t> ConversationItems; static TArray<menuitem_t> ConversationItems;

2
src/p_conversation.h
View file

@ -54,7 +54,7 @@ extern TArray<FStrifeDialogueNode *> StrifeDialogues;
// to their index in the mobjinfo table. This table indexes all // to their index in the mobjinfo table. This table indexes all
// the Strife actor types in the order Strife had them and is // the Strife actor types in the order Strife had them and is
// initialized as part of the actor's setup in infodefaults.cpp. // initialized as part of the actor's setup in infodefaults.cpp.
extern const PClass *StrifeTypes[344]; extern const PClass *StrifeTypes[999];
void P_LoadStrifeConversations (const char *mapname); void P_LoadStrifeConversations (const char *mapname);
void P_FreeStrifeConversations (); void P_FreeStrifeConversations ();

4
src/thingdef.cpp
View file

@ -2305,9 +2305,9 @@ static void ActorConversationID (AActor *defaults, Baggage &bag)
if (convid==-1) return; if (convid==-1) return;
} }
if (convid<0 || convid>344) if (convid<0 || convid>999)
{ {
SC_ScriptError ("ConversationID must be in the range [0,344]"); SC_ScriptError ("ConversationID must be in the range [0,999]");
} }
else StrifeTypes[convid] = bag.Info->Class; else StrifeTypes[convid] = bag.Info->Class;
} }