Merge pull request odamex#959 from odamex/lexi/issue-949

[BUGFIX] Fix crash when switching wads with differing HORDEDEFs

Author: bcahue

common/g_horde.cpp

@@ -35,6 +35,8 @@
 
 extern std::vector<hordeDefine_t> WAVE_DEFINES;
 
+static hordeDefine_t EMPTY_WAVE_DEFINE;
+
 typedef OHashTable<std::string, mobjtype_t> AliasMap;
 AliasMap g_aliasMap;
 
@@ -506,11 +508,20 @@ void G_ParseHordeDefs()
 }
 
 /**
- * @brief Resolve a horde define ID to an actual define.  Should be identical on client and server.
+ * @brief Resolve a horde define ID to an actual define.  Should be identical on client
+ * and server.
  *
  * @param id ID of define.
  */
 const hordeDefine_t& G_HordeDefine(size_t id)
 {
-	return ::WAVE_DEFINES.at(id);
+	if (id >= ::WAVE_DEFINES.size())
+	{
+		Printf(PRINT_WARNING,
+		       "Tried to access horde wave %llu but only have %llu hode defines!\n", id,
+		       ::WAVE_DEFINES.size());
+		return EMPTY_WAVE_DEFINE;
+	}
+
+	return ::WAVE_DEFINES[id];
 }

common/p_horde.cpp

@@ -232,7 +232,7 @@ class HordeState
 	/**
 	 * @brief Reset director state.
 	 */
-	void reset()
+	void reset(bool printWave)
 	{
 		setState(HS_STARTING);
 		m_wave = 1;
@@ -250,8 +250,12 @@ class HordeState
 		m_nextPowerup = ::level.time + (30 * TICRATE);
 		m_corpses.clear();
 
-		SV_BroadcastPrintf("Wave %d: \"%s\"\n", m_wave,
-		                   G_HordeDefine(m_defineID).name.c_str());
+		// Avoid printing wave name on boot and map switch.
+		if (printWave)
+		{
+			SV_BroadcastPrintf("Wave %d: \"%s\"\n", m_wave,
+			                   G_HordeDefine(m_defineID).name.c_str());
+		}
 	}
 
 	/**
@@ -718,6 +722,11 @@ void HordeState::tick()
 	}
 }
 
+void P_InitHorde()
+{
+	::g_HordeDirector.reset(false);
+}
+
 void P_NextSpawnTime(int& min, int& max)
 {
 	::g_HordeDirector.getNextSpawnTime(min, max);
@@ -800,7 +809,7 @@ void P_RunHordeTics()
 
 	if (::level.time == 0)
 	{
-		::g_HordeDirector.reset();
+		::g_HordeDirector.reset(true);
 	}
 
 	// Add our spawns if a level reload or reset erased our previous spawns.
@@ -941,6 +950,12 @@ BEGIN_COMMAND(hordewave)
 		return;
 	}
 
+	if (!G_IsHordeMode())
+	{
+		Printf("Can't change the wave define outside of horde mode.\n");
+		return;
+	}
+
 	if (!::g_HordeDirector.forceWave(argv[1]))
 	{
 		Printf("Could not find wave define starting with \"%s\"\n", argv[1]);
@@ -950,12 +965,24 @@ END_COMMAND(hordewave)
 
 BEGIN_COMMAND(hordenextwave)
 {
+	if (!G_IsHordeMode())
+	{
+		Printf("Can't advance the wave outside of horde mode.\n");
+		return;
+	}
+
 	::g_HordeDirector.nextWave();
 }
 END_COMMAND(hordenextwave)
 
 BEGIN_COMMAND(hordeboss)
 {
+	if (!G_IsHordeMode())
+	{
+		Printf("Can't spawn a horde boss outside of horde mode.\n");
+		return;
+	}
+
 	if (::g_HordeDirector.forceBoss())
 	{
 		Printf("Spawned the boss.\n");
@@ -973,6 +1000,12 @@ EXTERN_CVAR(g_horde_goalhp)
 
 BEGIN_COMMAND(hordeinfo)
 {
+	if (!G_IsHordeMode())
+	{
+		Printf("Can't obtain horde info outside of horde mode.\n");
+		return;
+	}
+
 	float skillScaler = 1.0f;
 	if (sv_skill == sk_medium)
 		skillScaler = 0.75f;

common/p_horde.h

@@ -92,6 +92,7 @@ struct hordeInfo_t
 	}
 };
 
+void P_InitHorde();
 void P_NextSpawnTime(int& min, int& max);
 hordeInfo_t P_HordeInfo();
 void P_SetHordeInfo(const hordeInfo_t& info);

common/p_setup.cpp

@@ -1961,6 +1961,7 @@ void P_Init (void)
 	P_InitPicAnims ();
 	R_InitSprites (sprnames);
 	InitTeamInfo();
+	P_InitHorde();
 }
 
 CVAR_FUNC_IMPL(sv_intermissionlimit)