]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
show times too
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 12:15:00 +0000 (15:15 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 12:15:00 +0000 (15:15 +0300)
qcsrc/client/hud.qc
qcsrc/server/race.qc

index 63474604a0b5ad5915c1372b1441a3d027f700a3..262aee4e11b5f5d7ebf96f0b356e48a0d0a98c81 100644 (file)
@@ -2921,13 +2921,13 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s
                }
        } else if(msg == MSG_RACE) {
                if(type == RACE_SERVER_RECORD) {
-                       HUD_KillNotify_Push(s1, "", 0, RACE_SERVER_RECORD);
+                       HUD_KillNotify_Push(s1, s2, 1, RACE_SERVER_RECORD);
                }
                else if(type == RACE_NEW_RANK) {
-                       HUD_KillNotify_Push(s1, "", 0, RACE_NEW_RANK);
+                       HUD_KillNotify_Push(s1, s2, 1, RACE_NEW_RANK);
                }
                else if(type == RACE_NEW_TIME) {
-                       HUD_KillNotify_Push(s1, "", 0, RACE_NEW_TIME);
+                       HUD_KillNotify_Push(s1, s2, 1, RACE_NEW_TIME);
                }
        }
 }
@@ -3187,18 +3187,6 @@ void HUD_Notify (void)
                                        s = "notify_blue_captured";
                                }
                        }
-                       else if(killnotify_deathtype[j] == RACE_SERVER_RECORD)
-                       {
-                               s = "race_newrecordserver";
-                       }
-                       else if(killnotify_deathtype[j] == RACE_NEW_RANK)
-                       {
-                               s = "race_newrankyellow";
-                       }
-                       else if(killnotify_deathtype[j] == RACE_NEW_TIME)
-                       {
-                               s = "race_newtime";
-                       }
                        if(s != "" && a)
                        {
                                drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
@@ -3277,6 +3265,18 @@ void HUD_Notify (void)
                        {
                                s = "notify_void";
                        }
+                       else if(killnotify_deathtype[j] == RACE_SERVER_RECORD)
+                       {
+                               s = "race_newrecordserver";
+                       }
+                       else if(killnotify_deathtype[j] == RACE_NEW_RANK)
+                       {
+                               s = "race_newrankyellow";
+                       }
+                       else if(killnotify_deathtype[j] == RACE_NEW_TIME)
+                       {
+                               s = "race_newtime";
+                       }
                        if(s != "" && a)
                        {
                                drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
index fde140069956f0129ca32f9257b933e70ec66ebe..1032f002cdc32099b2b72a1414ba75bfaf14924e 100644 (file)
@@ -202,22 +202,22 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
                        bprint(mynetname, "^1 broke ", oldrec_holder, "^1's 1st place record with ", strcat(TIME_ENCODED_TOSTRING(t), recorddifference, "\n"));
                }
                race_SendStatus(3, e); // "new server record"
-               Send_KillNotification(e.netname, "", "", RACE_SERVER_RECORD, MSG_RACE);
+               Send_KillNotification(e.netname, TIME_ENCODED_TOSTRING(t), "", RACE_SERVER_RECORD, MSG_RACE);
        } else {
                if(newpos == player_prevpos) {
                        recorddifference = strcat(" ^2[-", TIME_ENCODED_TOSTRING(oldrec - t), "]");
                        bprint(mynetname, "^5 improved their ", race_placeName(newpos), " ^5place record with ", TIME_ENCODED_TOSTRING(t), recorddifference, "\n");
                        race_SendStatus(1, e); // "new time"
-                       Send_KillNotification(e.netname, "", "", RACE_NEW_TIME, MSG_RACE);
+                       Send_KillNotification(e.netname, TIME_ENCODED_TOSTRING(t), "", RACE_NEW_TIME, MSG_RACE);
                } else if (oldrec == 0) {
                        bprint(mynetname, "^2 set the ", race_placeName(newpos), " ^2place record with ", TIME_ENCODED_TOSTRING(t), "\n");
                        race_SendStatus(2, e); // "new rank"
-                       Send_KillNotification(e.netname, "", "", RACE_NEW_RANK, MSG_RACE);
+                       Send_KillNotification(e.netname, TIME_ENCODED_TOSTRING(t), "", RACE_NEW_RANK, MSG_RACE);
                } else {
                        recorddifference = strcat(" ^2[-", TIME_ENCODED_TOSTRING(oldrec - t), "]");
                        bprint(mynetname, "^2 broke ", oldrec_holder, "^2's ", race_placeName(newpos), " ^2place record with ", strcat(TIME_ENCODED_TOSTRING(t), recorddifference, "\n"));
                        race_SendStatus(2, e); // "new rank"
-                       Send_KillNotification(e.netname, "", "", RACE_NEW_TIME, MSG_RACE);
+                       Send_KillNotification(e.netname, TIME_ENCODED_TOSTRING(t), "", RACE_NEW_TIME, MSG_RACE);
                }
        }
 }