From b77fed0c66f7b7c487bd6afd342f0bdc14092cad Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 19 Jun 2011 16:08:59 +0200 Subject: [PATCH] Clean up: add Send_CSQC_Centerprint_Generic_Expire --- qcsrc/server/cl_client.qc | 6 +++--- qcsrc/server/g_world.qc | 4 ++-- qcsrc/server/miscfunctions.qc | 4 ++++ qcsrc/server/mutators/gamemode_keyhunt.qc | 4 ++-- qcsrc/server/w_minstanex.qc | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 0f22be6d8..49a050f64 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2452,7 +2452,7 @@ void LeaveSpectatorMode() bprint ("^4", self.netname, "^4 is playing now\n"); if(!autocvar_g_campaign) - Send_CSQC_Centerprint_Generic(self, CPID_MOTD, "", 1, 0); // clear MOTD + Send_CSQC_Centerprint_Generic_Expire(self, CPID_MOTD); // clear MOTD return; } else { @@ -2703,7 +2703,7 @@ void PlayerPreThink (void) self.motd_actived_time = time; else if (time - self.motd_actived_time > 2) { // hide it some seconds after BUTTON_INFO has been released self.motd_actived_time = 0; - Send_CSQC_Centerprint_Generic(self, CPID_MOTD, "", 1, 0); + Send_CSQC_Centerprint_Generic_Expire(self, CPID_MOTD); } } } else { @@ -2712,7 +2712,7 @@ void PlayerPreThink (void) self.motd_actived_time = time; else if (time - self.motd_actived_time > 2) { // hide it some seconds after BUTTON_INFO has been released self.motd_actived_time = 0; - Send_CSQC_Centerprint_Generic(self, CPID_MOTD, "", 1, 0); + Send_CSQC_Centerprint_Generic_Expire(self, CPID_MOTD); } } } diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 8ffe1b7c4..6bf881935 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -158,7 +158,7 @@ void timeoutHandler_Think() { //get rid of the countdown message FOR_EACH_REALCLIENT(plr) { if(plr.classname == "player") { - Send_CSQC_Centerprint_Generic(plr, CPID_TIMEOUT_COUNTDOWN, "", 1, 0); + Send_CSQC_Centerprint_Generic_Expire(plr, CPID_TIMEOUT_COUNTDOWN); } } remove(self); @@ -169,7 +169,7 @@ void timeoutHandler_Think() { else if (timeoutStatus == 0) { //if a player called the resumegame command (which set timeoutStatus to 0 already) FOR_EACH_REALCLIENT(plr) { if(plr.classname == "player") { - Send_CSQC_Centerprint_Generic(plr, CPID_TIMEOUT_COUNTDOWN, "", 1, 0); + Send_CSQC_Centerprint_Generic_Expire(plr, CPID_TIMEOUT_COUNTDOWN); } } remove(self); diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 46b6952b9..859b36783 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1674,6 +1674,10 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s1, float duration }); } } +void Send_CSQC_Centerprint_Generic_Expire(entity e, float id) +{ + Send_CSQC_Centerprint_Generic(e, id, "", 1, 0); +} // WARNING: this kills the trace globals #define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return #define EXACTTRIGGER_INIT WarpZoneLib_ExactTrigger_Init() diff --git a/qcsrc/server/mutators/gamemode_keyhunt.qc b/qcsrc/server/mutators/gamemode_keyhunt.qc index bd4b3d5d7..540530dd9 100644 --- a/qcsrc/server/mutators/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/gamemode_keyhunt.qc @@ -882,7 +882,7 @@ void kh_EnableTrackingDevice() // runs after each round FOR_EACH_PLAYER(player) if(clienttype(player) == CLIENTTYPE_REAL) - Send_CSQC_Centerprint_Generic(player, CPID_KH_MSG, "", 1, 0); + Send_CSQC_Centerprint_Generic_Expire(player, CPID_KH_MSG); kh_tracking_enabled = TRUE; } @@ -908,7 +908,7 @@ void kh_StartRound() // runs at the start of each round FOR_EACH_PLAYER(player) if(clienttype(player) == CLIENTTYPE_REAL) - Send_CSQC_Centerprint_Generic(player, CPID_KH_MSG, "", 1, 0); + Send_CSQC_Centerprint_Generic_Expire(player, CPID_KH_MSG); for(i = 0; i < kh_teams; ++i) { diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 2b7f7aa05..403c7acd5 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -94,7 +94,7 @@ void minstagib_stop_countdown(void) if (self.minstagib_needammo) { self.health = 100; - Send_CSQC_Centerprint_Generic(self, CPID_MINSTA_FINDAMMO, "", 1, 0); + Send_CSQC_Centerprint_Generic_Expire(self, CPID_MINSTA_FINDAMMO); } self.minstagib_needammo = FALSE; } -- 2.39.2