Remove `-Wno-double-declaration`

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Main.qc

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 58bd4f497478544bb9527df0388a9f68454c7658..e9591e51d8a40bc99a9f98d2f53b11da42ff60a7 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -10,7 +10,7 @@ void clearentity(entity e)
                clearentity_ent = spawn();
                clearentity_ent.classname = "clearentity";
        }
-       float n = e.entnum;
+       int n = e.entnum;
        copyentity(clearentity_ent, e);
        e.entnum = n;
 }
@@ -39,12 +39,7 @@ void CSQC_Init(void)
        dprintf("^4CSQC Build information: ^1%s\n", WATERMARK);
 #endif
 
-       float i;
-
-#ifdef COMPAT_XON050_ENGINE
-       // old engine lacks implementation of player_localnum
-       player_localnum = player_localentnum - 1;
-#endif
+       int i;
 
        binddb = db_create();
        tempdb = db_create();
@@ -52,7 +47,7 @@ void CSQC_Init(void)
        compressShortVector_init();
 
        draw_endBoldFont();
-       menu_visible = FALSE;
+       menu_visible = false;
        menu_show = menu_show_error;
        menu_action = func_null;
 
@@ -179,7 +174,7 @@ void Shutdown(void)
 }
 
 .float has_team;
-float SetTeam(entity o, float Team)
+float SetTeam(entity o, int Team)
 {
        entity tm;
        if(teamplay)
@@ -224,7 +219,7 @@ float SetTeam(entity o, float Team)
                        tm = GetTeam(o.team, false);
                        tm.team_size -= 1;
                        o.has_team = 0;
-                       return TRUE;
+                       return true;
                }
        }
        else
@@ -235,7 +230,7 @@ float SetTeam(entity o, float Team)
                        tm = GetTeam(Team, true);
                        tm.team_size += 1;
                        o.has_team = 1;
-                       return TRUE;
+                       return true;
                }
                else if(Team != o.team)
                {
@@ -244,15 +239,15 @@ float SetTeam(entity o, float Team)
                        o.team = Team;
                        tm = GetTeam(Team, true);
                        tm.team_size += 1;
-                       return TRUE;
+                       return true;
                }
        }
-       return FALSE;
+       return false;
 }
 
 void Playerchecker_Think()
 {
-       float i;
+    int i;
        entity e;
        for(i = 0; i < maxclients; ++i)
        {
@@ -304,8 +299,6 @@ void PostInit(void)
        postinit = true;
 }
 
-float button_zoom;
-
 // CSQC_InputEvent : Used to perform actions based on any key pressed, key released and mouse on the client.
 // Return value should be 1 if CSQC handled the input, otherwise return 0 to have the input passed to the engine.
 // All keys are in ascii.
@@ -326,7 +319,7 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 
        if(menu_visible && menu_action)
                if(menu_action(bInputType, nPrimary, nSecondary))
-                       return TRUE;
+                       return true;
 
        return bSkipKey;
 }
@@ -342,7 +335,7 @@ void Ent_RemoveEntCS()
 }
 void Ent_ReadEntCS()
 {
-       float sf;
+    int sf;
        InterpolateOrigin_Undo();
 
        self.classname = "entcs_receiver";
@@ -391,8 +384,8 @@ void Ent_RemovePlayerScore()
 
 void Ent_ReadPlayerScore()
 {
-       float i, n;
-       float isNew;
+       int i, n;
+       bool isNew;
        entity o;
 
        // damnit -.- don't want to go change every single .sv_entnum in hud.qc AGAIN
@@ -423,7 +416,7 @@ void Ent_ReadPlayerScore()
        //      RegisterPlayer(o);
        //playerchecker will do this for us later, if it has not already done so
 
-       float sf, lf;
+    int sf, lf;
 #if MAX_SCORE <= 8
        sf = ReadByte();
        lf = ReadByte();
@@ -431,7 +424,7 @@ void Ent_ReadPlayerScore()
        sf = ReadShort();
        lf = ReadShort();
 #endif
-       float p;
+    int p;
        for(i = 0, p = 1; i < MAX_SCORE; ++i, p *= 2)
                if(sf & p)
                {
@@ -449,13 +442,13 @@ void Ent_ReadPlayerScore()
 
 void Ent_ReadTeamScore()
 {
-       float i;
+       int i;
        entity o;
 
        self.team = ReadByte();
        o = self.owner = GetTeam(self.team, true); // these team numbers can always be trusted
 
-       float sf, lf;
+    int sf, lf;
 #if MAX_TEAMSCORE <= 8
        sf = ReadByte();
        lf = ReadByte();
@@ -463,7 +456,7 @@ void Ent_ReadTeamScore()
        sf = ReadShort();
        lf = ReadShort();
 #endif
-       float p;
+       int p;
        for(i = 0, p = 1; i < MAX_TEAMSCORE; ++i, p *= 2)
                if(sf & p)
                {
@@ -478,10 +471,9 @@ void Ent_ReadTeamScore()
 
 void Ent_ClientData()
 {
-       float f;
        float newspectatee_status;
 
-       f = ReadByte();
+    int f = ReadByte();
 
        scoreboard_showscores_force = (f & 1);
 
@@ -523,14 +515,14 @@ void Ent_ClientData()
        }
        spectatee_status = newspectatee_status;
 
-       // non-COMPAT_XON050_ENGINE: we could get rid of spectatee_status, and derive it from player_localentnum and player_localnum
+       // we could get rid of spectatee_status, and derive it from player_localentnum and player_localnum
 }
 
 void Ent_Nagger()
 {
-       float nags, i, j, b, f;
+    int i, j, b, f;
 
-       nags = ReadByte(); // NAGS NAGS NAGS NAGS NAGS NAGS NADZ NAGS NAGS NAGS
+    int nags = ReadByte(); // NAGS NAGS NAGS NAGS NAGS NAGS NADZ NAGS NAGS NAGS
 
        if(!(nags & 4))
        {
@@ -583,9 +575,9 @@ void Ent_Nagger()
 
 void Ent_EliminatedPlayers()
 {
-       float sf, i, j, b, f;
+    int i, j, b, f;
 
-       sf = ReadByte();
+    int sf = ReadByte();
        if(sf & 1)
        {
                for(j = 0; j < maxclients; ++j)
@@ -612,8 +604,8 @@ void Ent_RandomSeed()
 
 void Ent_ReadAccuracy(void)
 {
-       float sf, f, w, b;
-       sf = ReadInt24_t();
+    int f, w;
+    int sf = ReadInt24_t();
        if(sf == 0)
        {
                for(w = 0; w <= WEP_LAST - WEP_FIRST; ++w)
@@ -625,7 +617,7 @@ void Ent_ReadAccuracy(void)
        {
                if(sf & f)
                {
-                       b = ReadByte();
+            int b = ReadByte();
                        if(b == 0)
                                weapon_accuracy[w] = -1;
                        else if(b == 255)
@@ -735,7 +727,7 @@ void Ent_ReadSpawnEvent(float is_new)
                if(autocvar_cl_unpress_zoom_on_spawn)
                {
                        localcmd("-zoom\n");
-                       button_zoom = FALSE;
+                       button_zoom = false;
                }
        }
 
@@ -932,7 +924,7 @@ void Fog_Force()
 void Gamemode_Init();
 void Ent_ScoresInfo()
 {
-       float i;
+    int i;
        self.classname = "ent_client_scores_info";
        gametype = ReadInt24_t();
        HUD_ModIcons_SetFunc();
@@ -1098,13 +1090,13 @@ void Net_ReadRace()
                        race_speedaward_alltimebest_holder = strzone(ReadString());
                        break;
                case RACE_NET_SERVER_RANKINGS:
-                       float pos, prevpos, del;
-                       pos = ReadShort();
+                       float prevpos, del;
+            int pos = ReadShort();
                        prevpos = ReadShort();
                        del = ReadShort();
 
                        // move other rankings out of the way
-                       float i;
+            int i;
                        if (prevpos) {
                                for (i=prevpos-1;i>pos-1;--i) {
                                        grecordtime[i] = grecordtime[i-1];
@@ -1159,7 +1151,7 @@ void Net_TeamNagger()
 
 void Net_ReadPingPLReport()
 {
-       float e, pi, pl, ml;
+       int e, pi, pl, ml;
        e = ReadByte();
        pi = ReadShort();
        pl = ReadByte();