From 886829721485bb98d67f52a53a0904bc89522622 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Tue, 25 Sep 2012 19:11:08 -0400 Subject: [PATCH] REALLY make it work :D --- qcsrc/client/Main.qc | 1 + qcsrc/common/notifications.qc | 6 +++--- qcsrc/server/g_world.qc | 2 ++ qcsrc/server/mutators/gamemode_ctf.qc | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 43cb8cb2f..41df61759 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -154,6 +154,7 @@ void CSQC_Init(void) // needs to be done so early because of the constants they create RegisterWeapons(); RegisterGametypes(); + DecNotifs(); WaypointSprite_Load(); diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc index 673a8e182..487e26526 100644 --- a/qcsrc/common/notifications.qc +++ b/qcsrc/common/notifications.qc @@ -130,11 +130,11 @@ MSG_WEAPON_NOTIFICATIONS string normal_or_gentle(string normal, string gentle) { -#ifdef CSQC + #ifdef CSQC if(autocvar_cl_gentle || autocvar_cl_gentle_messages) -#else + #else if(autocvar_sv_gentle) -#endif + #endif return ((gentle != "") ? gentle : normal); else return normal; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 8000c69ed..f4496f1ac 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -563,6 +563,7 @@ void spawnfunc___init_dedicated_server(void) void Map_MarkAsRecent(string m); float world_already_spawned; void RegisterWeapons(); +void DecNotifs(); void Nagger_Init(); void ClientInit_Spawn(); void WeaponStats_Init(); @@ -602,6 +603,7 @@ void spawnfunc_worldspawn (void) // needs to be done so early because of the constants they create RegisterWeapons(); RegisterGametypes(); + DecNotifs(); ServerProgsDB = db_load(strcat("server.db", autocvar_sessionid)); diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 7dbf4048d..ef4267854 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -287,7 +287,7 @@ void ctf_Handle_Retrieve(entity flag, entity player) FOR_EACH_REALPLAYER(tmp_player) { if(tmp_player == sender) - Send_Notification(MSG_CENTER, tmp_player, CENTER_CTF_EVENT_PASS_SENT, flag.netname, sender.netname, ""); + Send_Notification(MSG_CENTER, tmp_player, CENTER_CTF_EVENT_PASS_SENT, flag.netname, player.netname, ""); else if(tmp_player == player) Send_Notification(MSG_CENTER, tmp_player, CENTER_CTF_EVENT_PASS_RECEIVED, flag.netname, sender.netname, ""); else if(!IsDifferentTeam(tmp_player, sender)) -- 2.39.2