diff --git a/src/server/cstrike/gamerules.cpp b/src/server/cstrike/gamerules.cpp index dde743ee..67b21681 100644 --- a/src/server/cstrike/gamerules.cpp +++ b/src/server/cstrike/gamerules.cpp @@ -270,7 +270,7 @@ CSGameRules::LevelNewParms(void) } void -CSGameRules::PlayerConnect(entity pl) +CSGameRules::PlayerConnect(base_player pl) { entity a; bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname)); @@ -291,7 +291,7 @@ CSGameRules::PlayerConnect(entity pl) } void -CSGameRules::PlayerDisconnect(entity pl) +CSGameRules::PlayerDisconnect(base_player pl) { bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); diff --git a/src/server/cstrike/gamerules.h b/src/server/cstrike/gamerules.h index 2b16d211..51b3a096 100644 --- a/src/server/cstrike/gamerules.h +++ b/src/server/cstrike/gamerules.h @@ -18,8 +18,8 @@ class CSGameRules:CGameRules { - virtual void(entity) PlayerConnect; - virtual void(entity) PlayerDisconnect; + virtual void(base_player) PlayerConnect; + virtual void(base_player) PlayerDisconnect; virtual void(base_player) PlayerKill; virtual void(base_player) PlayerPostFrame; virtual void(base_player) PlayerDeath; diff --git a/src/server/entry.c b/src/server/entry.c index 880a224c..edca8ad7 100644 --- a/src/server/entry.c +++ b/src/server/entry.c @@ -32,18 +32,22 @@ void StartFrame(void) void ClientConnect(float csqc_active) { - g_grMode.PlayerConnect(self); + /* make sure you never change the classname. ever. */ + if (self.classname != "player") { + spawnfunc_player(); + } + + g_grMode.PlayerConnect((base_player)self); } void ClientDisconnect(void) { - g_grMode.PlayerDisconnect(self); + g_grMode.PlayerDisconnect((base_player)self); } void ClientKill(void) { - player pl = (player)self; - g_grMode.PlayerKill(pl); + g_grMode.PlayerKill((base_player)self); } void SpectatorThink(void) @@ -61,15 +65,7 @@ void SpectatorDisconnect(void) void PutClientInServer(void) { - player pl; - - /* make sure you never change the classname. ever. */ - if (self.classname != "player") { - spawnfunc_player(); - } - - pl = (player)self; - g_grMode.PlayerSpawn(pl); + g_grMode.PlayerSpawn((base_player)self); /* activate all game_playerspawn entities */ for (entity a = world; (a = find(a, ::targetname, "game_playerspawn"));) { @@ -82,14 +78,12 @@ void PutClientInServer(void) void PlayerPreThink(void) { - player pl = (player)self; - g_grMode.PlayerPreFrame(pl); + g_grMode.PlayerPreFrame((base_player)self); } void PlayerPostThink(void) { - player pl = (player)self; - g_grMode.PlayerPostFrame(pl); + g_grMode.PlayerPostFrame((base_player)self); } void SetNewParms(void) @@ -101,8 +95,7 @@ void SetNewParms(void) void SetChangeParms(void) { iprint("Setting Level-Change Parameters"); - player pl = (player)self; - g_grMode.LevelChangeParms(pl); + g_grMode.LevelChangeParms((base_player)self); } void SV_RunClientCommand(void) diff --git a/src/server/gamerules.cpp b/src/server/gamerules.cpp index 4a7cd7b8..95f3f18e 100644 --- a/src/server/gamerules.cpp +++ b/src/server/gamerules.cpp @@ -35,12 +35,12 @@ CGameRules::ConsoleCommand(base_player pl, string cmd) /* client */ void -CGameRules::PlayerConnect(entity pl) +CGameRules::PlayerConnect(base_player pl) { //print("ClientConnect!\n"); } void -CGameRules::PlayerDisconnect(entity pl) +CGameRules::PlayerDisconnect(base_player pl) { //print("ClientDisconnect!\n"); } diff --git a/src/server/gamerules.h b/src/server/gamerules.h index 4321e743..812c3c0b 100644 --- a/src/server/gamerules.h +++ b/src/server/gamerules.h @@ -29,8 +29,8 @@ class CGameRules virtual float(base_player,string) ConsoleCommand; /* client */ - virtual void(entity) PlayerConnect; - virtual void(entity) PlayerDisconnect; + virtual void(base_player) PlayerConnect; + virtual void(base_player) PlayerDisconnect; virtual void(base_player) PlayerKill; virtual void(base_player) PlayerSpawn; virtual void(base_player) PlayerPreFrame; diff --git a/src/server/gearbox/gamerules.cpp b/src/server/gearbox/gamerules.cpp index b4b9fcff..f8338361 100644 --- a/src/server/gearbox/gamerules.cpp +++ b/src/server/gearbox/gamerules.cpp @@ -232,7 +232,7 @@ HLGameRules::LevelChangeParms(base_player pp) } void -HLGameRules::PlayerConnect(entity pl) +HLGameRules::PlayerConnect(base_player pl) { entity a; bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname)); @@ -253,7 +253,7 @@ HLGameRules::PlayerConnect(entity pl) } void -HLGameRules::PlayerDisconnect(entity pl) +HLGameRules::PlayerDisconnect(base_player pl) { bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); diff --git a/src/server/plugins.c b/src/server/plugins.c index 5a4bd034..e47596ff 100644 --- a/src/server/plugins.c +++ b/src/server/plugins.c @@ -206,7 +206,7 @@ Called whenever a new client connect to the game ================= */ int -Plugin_PlayerConnect(entity cl) +Plugin_PlayerConnect(base_player cl) { int rval; int tval; @@ -242,7 +242,7 @@ Called whenever a client leaves the game ================= */ int -Plugin_PlayerDisconnect(entity cl) +Plugin_PlayerDisconnect(base_player cl) { int rval; int tval; diff --git a/src/server/plugins.h b/src/server/plugins.h index ba2037bb..0eee932f 100644 --- a/src/server/plugins.h +++ b/src/server/plugins.h @@ -23,6 +23,6 @@ void Plugin_Shutdown(void); void Plugin_InitEnts(void); int Plugin_RunClientCommand(void); int Plugin_ParseClientCommand(string); -int Plugin_PlayerConnect(entity); -int Plugin_PlayerDisconnect(entity); +int Plugin_PlayerConnect(base_player); +int Plugin_PlayerDisconnect(base_player); void Plugin_PlayerObituary(entity, entity, int, int, int); diff --git a/src/server/poke646/gamerules.cpp b/src/server/poke646/gamerules.cpp index 47e69e2d..b0db2d0e 100644 --- a/src/server/poke646/gamerules.cpp +++ b/src/server/poke646/gamerules.cpp @@ -195,7 +195,7 @@ HLGameRules::LevelChangeParms(base_player pp) } void -HLGameRules::PlayerConnect(entity pl) +HLGameRules::PlayerConnect(base_player pl) { entity a; bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname)); @@ -216,7 +216,7 @@ HLGameRules::PlayerConnect(entity pl) } void -HLGameRules::PlayerDisconnect(entity pl) +HLGameRules::PlayerDisconnect(base_player pl) { bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); diff --git a/src/server/rewolf/gamerules.cpp b/src/server/rewolf/gamerules.cpp index 6dcf50d4..97d399d9 100644 --- a/src/server/rewolf/gamerules.cpp +++ b/src/server/rewolf/gamerules.cpp @@ -210,7 +210,7 @@ HLGameRules::PlayerPostFrame(base_player pp) } void -HLGameRules::PlayerConnect(entity pl) +HLGameRules::PlayerConnect(base_player pl) { entity a; bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname)); @@ -231,7 +231,7 @@ HLGameRules::PlayerConnect(entity pl) } void -HLGameRules::PlayerDisconnect(entity pl) +HLGameRules::PlayerDisconnect(base_player pl) { bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); diff --git a/src/server/scihunt/gamerules.cpp b/src/server/scihunt/gamerules.cpp index 424c7e6c..f4659213 100644 --- a/src/server/scihunt/gamerules.cpp +++ b/src/server/scihunt/gamerules.cpp @@ -333,7 +333,7 @@ SHMultiplayerRules::PlayerPostFrame(base_player pp) } void -SHMultiplayerRules::PlayerConnect(entity pl) +SHMultiplayerRules::PlayerConnect(base_player pl) { entity a; bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname)); @@ -354,7 +354,7 @@ SHMultiplayerRules::PlayerConnect(entity pl) } void -SHMultiplayerRules::PlayerDisconnect(entity pl) +SHMultiplayerRules::PlayerDisconnect(base_player pl) { bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); diff --git a/src/server/scihunt/gamerules.h b/src/server/scihunt/gamerules.h index a4c7b9a7..3aed23d7 100644 --- a/src/server/scihunt/gamerules.h +++ b/src/server/scihunt/gamerules.h @@ -20,8 +20,8 @@ class SHMultiplayerRules:CGameRules { /* client */ virtual void(base_player) PlayerSpawn; - virtual void(entity) PlayerConnect; - virtual void(entity) PlayerDisconnect; + virtual void(base_player) PlayerConnect; + virtual void(base_player) PlayerDisconnect; virtual void(base_player) PlayerKill; virtual void(base_player) PlayerDeath; virtual void(base_player) PlayerPostFrame; diff --git a/src/server/tfc/gamerules.cpp b/src/server/tfc/gamerules.cpp index ba83066c..f334ff32 100644 --- a/src/server/tfc/gamerules.cpp +++ b/src/server/tfc/gamerules.cpp @@ -128,7 +128,7 @@ TFCGameRules::LevelNewParms(void) } void -TFCGameRules::PlayerConnect(entity pl) +TFCGameRules::PlayerConnect(base_player pl) { entity a; bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname)); @@ -149,7 +149,7 @@ TFCGameRules::PlayerConnect(entity pl) } void -TFCGameRules::PlayerDisconnect(entity pl) +TFCGameRules::PlayerDisconnect(base_player pl) { bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); diff --git a/src/server/tfc/gamerules.h b/src/server/tfc/gamerules.h index e0fe6dac..c3ed26b3 100644 --- a/src/server/tfc/gamerules.h +++ b/src/server/tfc/gamerules.h @@ -16,8 +16,8 @@ class TFCGameRules:CGameRules { - virtual void(entity) PlayerConnect; - virtual void(entity) PlayerDisconnect; + virtual void(base_player) PlayerConnect; + virtual void(base_player) PlayerDisconnect; virtual void(base_player) PlayerPostFrame; virtual void(base_player) PlayerSpawn; virtual void(base_player) PlayerKill; diff --git a/src/server/valve/gamerules.cpp b/src/server/valve/gamerules.cpp index ffbd2a31..e7430f12 100644 --- a/src/server/valve/gamerules.cpp +++ b/src/server/valve/gamerules.cpp @@ -209,7 +209,7 @@ HLGameRules::PlayerPostFrame(base_player pl) } void -HLGameRules::PlayerConnect(entity pl) +HLGameRules::PlayerConnect(base_player pl) { entity a; @@ -232,7 +232,7 @@ HLGameRules::PlayerConnect(entity pl) } void -HLGameRules::PlayerDisconnect(entity pl) +HLGameRules::PlayerDisconnect(base_player pl) { if (Plugin_PlayerDisconnect(pl) == FALSE) bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); diff --git a/src/server/valve/gamerules.h b/src/server/valve/gamerules.h index c47cd570..b25b9947 100644 --- a/src/server/valve/gamerules.h +++ b/src/server/valve/gamerules.h @@ -16,8 +16,8 @@ class HLGameRules:CGameRules { - virtual void(entity) PlayerConnect; - virtual void(entity) PlayerDisconnect; + virtual void(base_player) PlayerConnect; + virtual void(base_player) PlayerDisconnect; virtual void(base_player) PlayerKill; virtual void(base_player) PlayerPostFrame; diff --git a/src/server/valve/input.c b/src/server/valve/input.c index cf35d2d4..08899306 100644 --- a/src/server/valve/input.c +++ b/src/server/valve/input.c @@ -91,6 +91,6 @@ void Game_Input(void) bprint(PRINT_HIGH, "Respawning all map entities...\n"); } } - + self.impulse = 0; }