]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Simplify message parsing and actually make it work better (it fixes duplicated MOTD...
authorterencehill <piuntn@gmail.com>
Sun, 19 Jun 2011 15:32:59 +0000 (17:32 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 19 Jun 2011 15:32:59 +0000 (17:32 +0200)
qcsrc/client/hud.qc

index a5b8f080a1cec5e7867011979738beb0e6fbf44a..f02af57f66cc7857858302e9a271f90c9404b135 100644 (file)
@@ -4356,21 +4356,12 @@ void centerprint_generic(float new_id, string strMessage, float duration, float
        {
                if (j == CENTERPRINT_MAX_MSGS)
                        j = 0;
-               if (new_id && new_id == centerprint_msgID[j]) // && centerprint_expire_time[j] >= time
+               if (new_id && new_id == centerprint_msgID[j])
                {
                        if(centerprint_messages[j])
                                strunzone(centerprint_messages[j]);
                        centerprint_messages[j] = strzone(strMessage);
 
-                       centerprint_time[j] = duration;
-                       centerprint_expire_time[j] = time + duration;
-                       centerprint_countdown_num[j] = countdown_num;
-                       return;
-               }
-               if(centerprint_messages[j] == strMessage)
-               {
-                       centerprint_msgID[j] = new_id;
-
                        centerprint_time[j] = duration;
                        centerprint_expire_time[j] = time + duration;
                        centerprint_countdown_num[j] = countdown_num;