Fix some crashy stuff.

VortexQuake2 · Apr 28, 2024 · 3ef9a6d · 3ef9a6d
1 parent 25feda9
commit 3ef9a6d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/combat/abilities/gloom.c b/src/combat/abilities/gloom.c
@@ -2295,7 +2295,8 @@ void spikeball_move (edict_t *self)
     // are we following the player's crosshairs?
     if (self->activator->spikeball_follow)
     {
-        G_GetSpawnLocation(self->activator, 8192, NULL, NULL, goalpos, NULL, PROJECT_HITBOX_FAR, false);
+		vec3_t v1 = {0}, v2 = {0};
+        G_GetSpawnLocation(self->activator, 8192, v1, v2, goalpos, NULL, PROJECT_HITBOX_FAR, false);
     }
         // we have no enemy
     else if (!self->enemy)

diff --git a/src/entities/drone/drone_medic.c b/src/entities/drone/drone_medic.c
@@ -975,7 +975,7 @@ mframe_t mymedic_frames_attackCable [] =
 	ai_charge, 0,		mymedic_cable_attack,
 	ai_charge, 0,		mymedic_cable_attack,
 	ai_charge, 0,		mymedic_cable_continue,	//227--loop from 218 to here
-	ai_charge, 0,		mymedic_cable_attack,
+	ai_charge, 0,		NULL,
 	ai_charge, 0,		mymedic_hook_retract,	//229
 	ai_charge, 0,		NULL,
 	ai_charge, 0,		NULL,

diff --git a/src/entities/drone/drone_misc.c b/src/entities/drone/drone_misc.c
@@ -2008,7 +2008,9 @@ qboolean M_Initialize (edict_t *ent, edict_t *monster, float dur_bonus)
 	monster->touch = drone_touch;
 	monster->think = drone_think;
 	DroneList_Insert(monster);
-	layout_add_tracked_entity(&ent->client->layout, monster);
+	if (ent->client)
+		layout_add_tracked_entity(&ent->client->layout, monster);
+
 	return true;
 }
 

diff --git a/src/menus/ally.c b/src/menus/ally.c
@@ -325,7 +325,7 @@ void AddAlly (edict_t *ent, edict_t *other)
 void RemoveAlly (edict_t *ent, edict_t *other)
 {
 	// will removing a player invalidate the team? (no more allies)
-    if (V_GetNumAllies(ent) - 1 < 1)
+    if (V_GetNumAllies(ent) - 1 < 1 && ent->teamnum >= 100 && ent->teamnum < 200)
 	{
 		// relinquish the team number for others to use
 		team_numbers[ent->teamnum - 100] = ent->teamnum;