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

more flexibility.



SVN r131 (trunk)

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

src/p_conversation.cpp

@@ -65,7 +65,7 @@ TArray<FStrifeDialogueNode *> 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<menuitem_t> ConversationItems;

src/p_conversation.h

@@ -54,7 +54,7 @@ extern TArray<FStrifeDialogueNode *> 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 ();

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;
 }