]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Fix the sbar again. At this point, I'm releasing version 0.2 :)
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 6 Sep 2010 22:47:47 +0000 (01:47 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 6 Sep 2010 22:47:47 +0000 (01:47 +0300)
data/qcsrc/client/sbar.qc

index 91a3c3dfb5bfabf4d0c8195308379e304dc7c4b9..d9223079ffb8859c4cb0a1f67effe61b7120b625 100644 (file)
@@ -508,15 +508,15 @@ void Cmd_Sbar_SetFields(float argc)
                        sbar_field[sbar_num_fields] = SP_SEPARATOR;\r
                        have_separator = 1;\r
                } else {\r
                        sbar_field[sbar_num_fields] = SP_SEPARATOR;\r
                        have_separator = 1;\r
                } else {\r
+                       if(gametype == GAME_RPG)\r
+                               return;\r
+\r
                        for(j = 0; j < MAX_SCORE; ++j)\r
                                if(str == strtolower(scores_label[j]))\r
                                        goto found; // sorry, but otherwise fteqcc -O3 miscompiles this and warns about "unreachable code"\r
 :notfound\r
                        if(str == "frags")\r
                        for(j = 0; j < MAX_SCORE; ++j)\r
                                if(str == strtolower(scores_label[j]))\r
                                        goto found; // sorry, but otherwise fteqcc -O3 miscompiles this and warns about "unreachable code"\r
 :notfound\r
                        if(str == "frags")\r
-                       {\r
-                               if not(gametype == GAME_RPG)\r
-                                       j = SP_FRAGS;\r
-                       }\r
+                               j = SP_FRAGS;\r
                        else\r
                        {\r
                                if not(nocomplain)\r
                        else\r
                        {\r
                                if not(nocomplain)\r