From: Lyberta <lyberta@lyberta.net>
Date: Mon, 11 Jun 2018 16:18:24 +0000 (+0300)
Subject: GunGame: Finishing touches.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95559195d5d2908c5a6576eb0eb168763bd5bdea;p=xonotic%2Fxonotic-data.pk3dir.git

GunGame: Finishing touches.
---

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index a4251c23f..37731c198 100644
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -536,6 +536,6 @@ set g_invasion_type 0 "type of invasion mode - 0: round-based, 1: hunting, 2: co
 // =========
 //  gungame
 // =========
-set g_gg 0 "GunGame: Kill players with all weapons"
+set g_gg 0 "GunGame: Kill players with all weapons. One weapon at a time."
 set g_gg_weapons "vortex mortar machinegun hagar arc electro devastator crylink shotgun blaster"
 set g_gg_kills_per_weapon 3 "Number of kills needed to advance to the next weapon"
diff --git a/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qc b/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qc
index cccfc72dc..9192e3bb6 100644
--- a/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qc
+++ b/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qc
@@ -1,6 +1,5 @@
 /// \file
 /// \brief Source file that contains implementation of the GunGame gamemode.
-/// \author Lyberta
 /// \copyright GNU GPLv2 or any later version.
 
 #include "sv_gungame.qh"
@@ -114,8 +113,6 @@ void GunGame_UpdateLeadingPlayer()
 	gungame_leading_level = GunGame_GetPlayerLevel(gungame_leading_player);
 	gungame_leading_weapon = GunGame_GetWeapon(gungame_leading_level);
 	GunGame_UpdateStats();
-	//PrintToChatAll(strcat(gungame_leading_player.netname,
-	//	" is leading with level ", ftos(gungame_leading_level)));
 }
 
 void GunGame_UpdateStats()
@@ -165,14 +162,12 @@ void GunGame_GivePlayerWeapon(entity player)
 /// \brief Hook that is called to determine if there is a weapon arena.
 MUTATOR_HOOKFUNCTION(gg, SetWeaponArena)
 {
-	//PrintToChatAll("SetWeaponArena");
 	M_ARGV(0, string) = "off";
 }
 
 /// \brief Hook that is called to determine start items of all players.
 MUTATOR_HOOKFUNCTION(gg, SetStartItems)
 {
-	//PrintToChatAll("SetStartItems");
 	start_weapons = WEPSET(Null);
 	warmup_start_weapons = WEPSET(Null);
 }
@@ -180,7 +175,6 @@ MUTATOR_HOOKFUNCTION(gg, SetStartItems)
 /// \brief Hook that is called when an item is about to spawn.
 MUTATOR_HOOKFUNCTION(gg, FilterItemDefinition)
 {
-	//PrintToChatAll("FilterItemDefinition");
 	entity item = M_ARGV(0, entity);
 	if (item.instanceOfAmmo)
 	{
@@ -243,6 +237,6 @@ MUTATOR_HOOKFUNCTION(gg, PlayerDies)
 /// \brief Hook that determines whether remaining frags are announced.
 MUTATOR_HOOKFUNCTION(gg, Scores_CountFragsRemaining)
 {
-	// announce remaining frags
+	// Announce remaining frags.
 	return true;
 }
diff --git a/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qh b/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qh
index 44df2e326..730a6f16b 100644
--- a/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qh
+++ b/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qh
@@ -1,12 +1,10 @@
 /// \file
 /// \brief Header file that describes the GunGame gamemode.
-/// \author Lyberta
 /// \copyright GNU GPLv2 or any later version.
 
 #pragma once
 
 /// \brief Initializes global data for the gametype.
-/// \return No return.
 void GunGame_Initialize();
 
 REGISTER_MUTATOR(gg, false)
diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 39ab76f53..1f632859c 100644
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -488,7 +488,7 @@ void HUD_Mod_GG(vector pos, vector mySize);
 CLASS(GunGame, Gametype)
     INIT(GunGame)
     {
-        this.gametype_init(this, _("GunGame"), "gg", "g_gg", false, "", "timelimit=20", _("Kill players with all weapons"));
+        this.gametype_init(this, _("GunGame"), "gg", "g_gg", false, "", "timelimit=20", _("Kill players with all weapons. One weapon at a time"));
     }
     METHOD(GunGame, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter))
     {