From 3431564b028178d54b78ff5a66a79b6f22fb71ff Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 19 May 2006 21:31:25 +0000 Subject: [PATCH] - Increased the StrifeTypes array to 999 entries so that custom WADs have more flexibility. SVN r131 (trunk) --- docs/rh-log.txt | 4 ++++ src/p_conversation.cpp | 2 +- src/p_conversation.h | 2 +- src/thingdef.cpp | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 076a85ff9..fa505e837 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -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 - 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 diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 9cdbd7894..559471826 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -65,7 +65,7 @@ TArray StrifeDialogues; // to their index in the mobjinfo table. This table indexes all // the Strife actor types in the order Strife had them and is // initialized as part of the actor's setup in infodefaults.cpp. -const PClass *StrifeTypes[344]; +const PClass *StrifeTypes[999]; static menu_t ConversationMenu; static TArray ConversationItems; diff --git a/src/p_conversation.h b/src/p_conversation.h index 435226348..60aa21d8c 100644 --- a/src/p_conversation.h +++ b/src/p_conversation.h @@ -54,7 +54,7 @@ extern TArray StrifeDialogues; // to their index in the mobjinfo table. This table indexes all // the Strife actor types in the order Strife had them and is // 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_FreeStrifeConversations (); diff --git a/src/thingdef.cpp b/src/thingdef.cpp index 3167f4fa8..689242625 100644 --- a/src/thingdef.cpp +++ b/src/thingdef.cpp @@ -2305,9 +2305,9 @@ static void ActorConversationID (AActor *defaults, Baggage &bag) 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; }