]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Now it compiles :D
authorSamual Lenks <samual@xonotic.org>
Sat, 23 Feb 2013 20:30:07 +0000 (15:30 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 23 Feb 2013 20:30:07 +0000 (15:30 -0500)
qcsrc/common/notifications.qh
qcsrc/server/g_damage.qc

index c480133682eb61938ebba0bc9e8ed65dfc8ed523..fdcdbdb1030c45416be55f908b623a94a58000d4 100644 (file)
@@ -541,6 +541,7 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration,
 var float autocvar_notification_version = NOTIF_VERSION;
 var float autocvar_notification_show_sprees = TRUE;
 var float autocvar_notification_show_sprees_center = TRUE;
+var float autocvar_notification_show_sprees_center_specialonly = TRUE;
 var float autocvar_notification_show_sprees_info = 3; // 0 = off, 1 = target only, 2 = attacker only, 3 = target and attacker
 var float autocvar_notification_show_sprees_info_newline = TRUE;
 var float autocvar_notification_show_sprees_info_specialonly = TRUE;
@@ -641,7 +642,7 @@ string notif_arg_spree_cen(float spree)
                                                                        _("%d frag spree! "),
                                                                        _("%d score spree! ")
                                                                ),
-                                                               spree)
+                                                               spree);
                                        }
                                        else { return ""; } // don't show spree information if it isn't an achievement 
                                }
@@ -649,14 +650,14 @@ string notif_arg_spree_cen(float spree)
 
                        #undef SPREE_ITEM
                }
-               /*else if(spree == -1) // first blood
+               else if(spree == -1) // first blood
                {
                        return normal_or_gentle(_("First blood! "), _("First score! "));
                }
                else if(spree == -2) // first victim
                {
                        return normal_or_gentle(_("First victim! "), _("First casualty! "));
-               }*/
+               }
        }
        #undef SPREE_NEWLINE
        return "";
index 9923ef2d03f4897ff87c3c766f552f9c12ecd656..cd104648f2c2299c63aedc708042b960a625b5e2 100644 (file)
@@ -451,7 +451,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
                        attacker.taunt_soundtime = time + 1;
                        attacker.killcount = attacker.killcount + 1;
 
-                       #define SPREE_ITEM(counta,countb,normal,gentle) \
+                       #define SPREE_ITEM(counta,countb,center,normal,gentle) \
                                case counta: \
                                { \
                                        AnnounceTo(attacker, strcat(#countb, "kills")); \