From b70b0cd6f99f762fef62c94d43138ebfdf6aede2 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 25 Mar 2020 20:20:53 +0100 Subject: [PATCH] Mititage startspot spawn-issues. --- src/client/gearbox/hud_weaponselect.c | 2 +- src/client/rewolf/hud_weaponselect.c | 2 +- src/client/valve/hud_weaponselect.c | 2 +- src/gs-entbase/server/trigger_changelevel.cpp | 4 +++- src/server/scihunt/client.c | 2 +- src/server/valve/client.c | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/client/gearbox/hud_weaponselect.c b/src/client/gearbox/hud_weaponselect.c index a78a05d6..3fe10072 100644 --- a/src/client/gearbox/hud_weaponselect.c +++ b/src/client/gearbox/hud_weaponselect.c @@ -116,7 +116,7 @@ int HUD_InSlotPos(int slot, int pos) return -1; } -int HUD_SlotSelect(int slot) +void HUD_SlotSelect(int slot) { player pl = (player)pSeat->ePlayer; int curslot = g_weapons[pSeat->fHUDWeaponSelected].slot; diff --git a/src/client/rewolf/hud_weaponselect.c b/src/client/rewolf/hud_weaponselect.c index 1cf13ef0..5592129b 100644 --- a/src/client/rewolf/hud_weaponselect.c +++ b/src/client/rewolf/hud_weaponselect.c @@ -118,7 +118,7 @@ int HUD_InSlotPos(int slot, int pos) return -1; } -int HUD_SlotSelect(int slot) +void HUD_SlotSelect(int slot) { player pl = (player)pSeat->ePlayer; int curslot = g_weapons[pSeat->fHUDWeaponSelected].slot; diff --git a/src/client/valve/hud_weaponselect.c b/src/client/valve/hud_weaponselect.c index db84435a..692f4248 100644 --- a/src/client/valve/hud_weaponselect.c +++ b/src/client/valve/hud_weaponselect.c @@ -110,7 +110,7 @@ int HUD_InSlotPos(int slot, int pos) return -1; } -int HUD_SlotSelect(int slot) +void HUD_SlotSelect(int slot) { player pl = (player)pSeat->ePlayer; int curslot = g_weapons[pSeat->fHUDWeaponSelected].slot; diff --git a/src/gs-entbase/server/trigger_changelevel.cpp b/src/gs-entbase/server/trigger_changelevel.cpp index 9b013e24..768fed1c 100644 --- a/src/gs-entbase/server/trigger_changelevel.cpp +++ b/src/gs-entbase/server/trigger_changelevel.cpp @@ -148,7 +148,9 @@ vector Landmark_GetSpot(void) if (!landmark) { print(sprintf("^1ERROR^7: Landmark_GetSpot: Cannot find startspot '%s'!\n",startspot)); - return __NULL__; + /* return something useful? */ + landmark = find(world, ::classname, "info_player_start"); + return landmark.origin; } return landmark.origin + g_landmarkpos; diff --git a/src/server/scihunt/client.c b/src/server/scihunt/client.c index a7219c03..3d164b54 100644 --- a/src/server/scihunt/client.c +++ b/src/server/scihunt/client.c @@ -203,7 +203,7 @@ void Game_PutClientInServer(void) if (cvar("sv_playerslots") == 1) { Game_DecodeChangeParms(); - if (startspot) { + if (startspot != "") { setorigin(pl, Landmark_GetSpot()); } else { spot = find(world, classname, "info_player_start"); diff --git a/src/server/valve/client.c b/src/server/valve/client.c index aa89e697..318737d4 100644 --- a/src/server/valve/client.c +++ b/src/server/valve/client.c @@ -320,7 +320,7 @@ Game_PutClientInServer(void) if (cvar("sv_playerslots") == 1) { Game_DecodeChangeParms(); - if (startspot) { + if (startspot != "") { setorigin(pl, Landmark_GetSpot()); } else { spot = find(world, classname, "info_player_start");