Remove country code due to Merge Request discussion

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 622bf3e047e8824ac71376aadb7fd535c67b17b4..a66fa0966470608ca3397926fe244bbb339f3914 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -162,7 +162,6 @@ string GetSpeedUnit(int speed_unit);
 
 .int team;
 .int team_size;
-.int countrycode;
 
 int binddb;
 

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index c4d24ed1f584a337d8327684f68514ae44e12189..a3691386be379296ae2b494025666e320a13de18 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -152,10 +152,6 @@ ENTCS_PROP(FRAGS, true, frags, frags, ENTCS_SET_NORMAL,
        { WriteShort(chan, ent.frags); },
        { ent.frags = ReadShort(); })
 
-ENTCS_PROP(COUNTRYCODE, true, countrycode, countrycode, ENTCS_SET_NORMAL,
-       { WriteByte(chan, ent.countrycode); },
-       { ent.countrycode = ReadByte(); })
-
 // use sv_solid to avoid changing solidity state of entcs entities
 ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
        { WriteByte(chan, ent.sv_solid); },

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index e20b42d85471e3ae9b12de237b46a6e6307a7e13..6ada1045168019e8589326922f29138afd823cba 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -972,39 +972,6 @@ void GameCommand_make_mapinfo(int request)
        }
 }
 
-void GameCommand_setflag(int request, int argc)
-{
-       switch (request)
-       {
-               case CMD_REQUEST_COMMAND:
-               {
-                       entity client;
-                       float accepted;
-                       
-                       client = GetFilteredEntity(argv(1));
-                       accepted = VerifyClientEntity(client, false, false);
-
-                       if (accepted <= 0)
-                       {
-                               LOG_INFO("^1ERROR^7: Couldn't set country flag");
-                               LOG_HELP("Usage:^3 sv_cmd setflag #client_id countrycode[0-249]");
-                               return;
-                       }
-                       
-                       client.countrycode = stof(argv(2));
-                       LOG_INFO("^2SUCCESS^7: Country flag set!");
-                       return;
-               }
-               default:
-                       LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
-               case CMD_REQUEST_USAGE:
-               {
-                       LOG_HELP("Usage:^3 sv_cmd setflag #client_id countrycode[0-249]");
-                       return;
-               }
-       }
-}
-
 void GameCommand_moveplayer(int request, int argc)
 {
        switch (request)
@@ -1655,8 +1622,6 @@ void GameCommand_(int request)
 // ==================================
 
 // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-SERVER_COMMAND(setflag, "Set client flag") { GameCommand_setflag(request, arguments); }
-
 SERVER_COMMAND(adminmsg, "Send an admin message to a client directly") { GameCommand_adminmsg(request, arguments); }
 SERVER_COMMAND(allready, "Restart the server and reset the players") { GameCommand_allready(request); }
 SERVER_COMMAND(allspec, "Force all players to spectate") { GameCommand_allspec(request, arguments); }