WIPEOUT: additional dm3 spawns

Author: dusty-qw

include/progs.h

@@ -1301,6 +1301,9 @@ typedef struct gedict_s
 // { csqc
 	func_t SendEntity;
 // }
+// { wipeout spawn
+	float custom_radius;                    // custom spawn radius for wipeout spawns
+// }
 } gedict_t;
 
 typedef enum

src/bot_client.c

@@ -129,6 +129,8 @@ void BotPlayerDeathEvent(gedict_t *self)
 // Was: PutClientInServer_apply()
 void BotClientEntersEvent(gedict_t *self, gedict_t *spawn_pos)
 {
+	gedict_t *marker;
+
 	self->fb.oldwaterlevel = self->fb.oldwatertype = 0;
 	self->fb.desired_angle[0] = self->s.v.angles[0];
 	self->fb.desired_angle[1] = self->s.v.angles[1];
@@ -138,7 +140,10 @@ void BotClientEntersEvent(gedict_t *self, gedict_t *spawn_pos)
 	self->fb.last_rndaim_time = 0;
 	self->fb.wiggle_run_dir = 0;
 
-	SetMarker(self, spawn_pos);
+	// Find the nearest navigation marker to the spawn point
+	// Don't use spawn_pos directly - it's not a navigation marker!
+	marker = spawn_pos ? LocateMarker(spawn_pos->s.v.origin) : NULL;
+	SetMarker(self, marker);
 
 	self->fb.arrow = 0;
 	ClearLookObject(self);

src/clan_arena.c

@@ -7,6 +7,7 @@
 typedef struct wipeout_spawn_config_t
 {
 	vec3_t origin;          // spawn point coordinates
+	float angle;          // spawn point angle (yaw)
 	char *name;             // spawn point name (for debugging)
 	float custom_radius;    // custom radius for this spawn (0 = use default)
 } wipeout_spawn_config;
@@ -18,15 +19,16 @@ typedef struct wipeout_map_spawns_t
 	int spawn_count;
 } wipeout_map_spawns;
 
-// Some spawns require a custom radius to prevent abuse
-// Using 0 defaults to a radius of 84 units
+// { {coords}, angle, name, radius }
 static wipeout_spawn_config dm3_spawns[] = {
-	{ { -880, -232, -16 },	"tele/sng",	128 },
-	{ { 192, -208, -176 },	"big>ra",	0   },
-	{ { 1472, -928, -24 },	"ya box",	0   },
-	{ { 1520, 432, -88 },	"rl",		300 },
-	{ { -632, -680, -16 },	"tele/ra",	128 },
-	{ { 512, 768, 216 }, 	"lifts",	128 }
+	{ { -880, -232, -16 },	90,		"tele/sng",	400 },
+	{ { 192, -208, -176 },	90,		"big>ra",	300 },
+	{ { 1472, -928, -24 },	90,		"ya box",	200 },
+	{ { 1520, 432, -88 },	0,		"rl",		400 },
+	{ { -632, -680, -16 },	90,		"tele/ra",	400 },
+	{ { 512, 768, 216 }, 	-90,	"lifts",	300 },
+	{ { -387, 233, -16 }, 	0,		"sng",		200 },
+	{ { 2021, -446, -24 }, 	180,	"bridge",	400 }
 };
 
 static wipeout_map_spawns wipeout_spawn_configs[] = {
@@ -58,8 +60,7 @@ void EndRound(int alive_team);
 void show_tracking_info(gedict_t *p);
 
 // Wipeout spawn management functions
-static wipeout_spawn_config* WO_FindSpawnConfig(vec3_t origin);
-float WO_GetSpawnRadius(vec3_t origin);
+float WO_GetSpawnRadius(gedict_t *spawn_point);
 void WO_InitializeSpawns(void);
 
 gedict_t* ca_find_player(gedict_t *p, gedict_t *observer)
@@ -666,7 +667,6 @@ void CA_PutClientInServer(void)
 		self->spawn_delay = 0;
 
 		setmodel(self, "");
-		setorigin(self, PASSVEC3(self->s.v.origin));
 
 		if (!self->in_limbo || ca_round_pause)
 		{
@@ -1800,63 +1800,51 @@ void CA_Frame(void)
 	}
 }
 
-// Find spawn configuration for a given origin
-static wipeout_spawn_config* WO_FindSpawnConfig(vec3_t origin)
-{
-	int i, j;
-	
-	if (cvar("k_clan_arena") != 2)  // Only for wipeout mode
-	{
-		return NULL;
-	}
-	
-	// Find current map configuration
-	for (i = 0; wipeout_spawn_configs[i].mapname; i++)
-	{
-		if (streq(mapname, wipeout_spawn_configs[i].mapname))
-		{
-			// Search for matching spawn point
-			for (j = 0; j < wipeout_spawn_configs[i].spawn_count; j++)
-			{
-				if (VectorCompare(origin, wipeout_spawn_configs[i].spawns[j].origin))
-				{
-					return &wipeout_spawn_configs[i].spawns[j];
-				}
-			}
-			break;
-		}
-	}
-	
-	return NULL;
-}
 
 // Get custom spawn radius for a spawn point
-float WO_GetSpawnRadius(vec3_t origin)
+float WO_GetSpawnRadius(gedict_t *spawn_point)
 {
-	wipeout_spawn_config *config = WO_FindSpawnConfig(origin);
-	
-	if (config && config->custom_radius > 0)
+	if (spawn_point && spawn_point->custom_radius > 0)
 	{
-		return config->custom_radius;
+		return spawn_point->custom_radius;
 	}
 
 	return 0;  // Use default radius
 }
 
-// Initialize wipeout spawns (can be called to reload configurations)
+// Initialize wipeout spawns by creating info_player_wipeout entities
+// from the wipeout_spawn_configs array. These custom spawns are used
+// exclusively during wipeout mode
 void WO_InitializeSpawns(void)
 {
 	if (cvar("k_clan_arena") == 2)
 	{
-		int i;
+		int i, j;
 		for (i = 0; wipeout_spawn_configs[i].mapname; i++)
 		{
 			if (streq(mapname, wipeout_spawn_configs[i].mapname))
 			{	
+				// Create spawn entities for each configured spawn point
+				for (j = 0; j < wipeout_spawn_configs[i].spawn_count; j++)
+				{
+					gedict_t *spawn_ent = spawn();
+					wipeout_spawn_config *spawn_cfg = &wipeout_spawn_configs[i].spawns[j];
+					
+					// Set entity properties
+					spawn_ent->classname = "info_player_wipeout";
+					
+					// Set origin and angles
+					VectorCopy(spawn_cfg->origin, spawn_ent->s.v.origin);
+					VectorSet(spawn_ent->s.v.angles, 0, spawn_cfg->angle, 0);
+					
+					// Custom wipeout radius
+					spawn_ent->custom_radius = spawn_cfg->custom_radius;
+				}
+				
 				if (cvar("developer"))
 				{
-					G_bprint(2, "Wipeout: Using custom spawn configuration for %s (%d spawns)\n",
-                	mapname, wipeout_spawn_configs[i].spawn_count);
+					G_bprint(2, "Wipeout: Created %d custom spawn points for %s\n",
+						wipeout_spawn_configs[i].spawn_count, mapname);
 				}
 
 				break;

src/client.c

@@ -58,7 +58,7 @@ void SendSpecInfo(gedict_t *spec, gedict_t *target_client);
 void del_from_specs_favourites(gedict_t *rm);
 void item_megahealth_rot(void);
 
-float WO_GetSpawnRadius(vec3_t origin);
+float WO_GetSpawnRadius(gedict_t *spawn_point);
 
 extern int g_matchstarttime;
 
@@ -1026,7 +1026,7 @@ static float GetEffectiveSpawnRadius(gedict_t *spot, float default_radius)
 {
 	if (cvar("k_clan_arena") == 2)
 	{
-		float custom_radius = WO_GetSpawnRadius(spot->s.v.origin);
+		float custom_radius = WO_GetSpawnRadius(spot);
 		if (custom_radius > 0)
 		{
 			return custom_radius;
@@ -2036,6 +2036,15 @@ void PutClientInServer(void)
 				"info_player_deathmatch" : streq(getteam(self), "red") ?
 				"info_player_team1_deathmatch" : "info_player_team2_deathmatch");
 		}
+		else if (cvar("k_clan_arena") == 2)  // Wipeout mode
+		{
+			spot = SelectSpawnPoint("info_player_wipeout");
+			// Fallback to regular spawns if no wipeout spawns exist
+			if (!spot)
+			{
+				spot = SelectSpawnPoint("info_player_deathmatch");
+			}
+		}
 		else if (isRA() && (isWinner(self) || isLoser(self)))
 		{
 			spot = SelectSpawnPoint("info_teleport_destination");
@@ -2052,6 +2061,13 @@ void PutClientInServer(void)
 
 	HM_log_spawn_point(self, spot);
 
+	// CRITICAL: Check that we actually found a spawn point
+	if (!spot)
+	{
+		G_Error("PutClientInServer: No spawn point found!\n");
+		return;
+	}
+
 	VectorCopy(spot->s.v.origin, self->s.v.origin);
 	self->s.v.origin[2] += 1;
 

src/g_spawn.c

@@ -459,6 +459,8 @@ spawn_t spawns[] =
 // k_ctf_based_spawn 2 "within home base" spawns.
 	{ "info_player_team1_deathmatch", 	SUB_Null },
 	{ "info_player_team2_deathmatch", 	SUB_Null },
+// Wipeout mode spawns
+	{ "info_player_wipeout", 			SUB_Null },
 //
 // TF -- well, we does not support TF but require it for loading TF map as CTF map.
 //