Properly handle MSG_DEATH in common functions now

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 8f93fe126bf7234ae2fc12f7550fd19866439b00..aab042262dc13f00902377df7d7ef83b49af6ab3 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -262,22 +262,22 @@ float Form_Score_Pos(entity player)
        MSG_DEATH_NOTIF(DEATH_SELF_SLIME,                                       CENTER_DEATH_SELF_SLIME,                                INFO_DEATH_SELF_SLIME) \
        MSG_DEATH_NOTIF(DEATH_SELF_SHOOTING_STAR,                       CENTER_DEATH_SELF_SHOOTING_STAR,                INFO_DEATH_SELF_SHOOTING_STAR) \
        MSG_DEATH_NOTIF(DEATH_SELF_SWAMP,                                       CENTER_DEATH_SELF_SWAMP,                                INFO_DEATH_SELF_SWAMP) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_FRAG,                                                      CENTER_DEATH_MURDER_FRAG,                                               INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED,                                           CENTER_DEATH_MURDER_FRAGGED,                                    INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG,                                          CENTER_DEATH_MURDER_TYPEFRAG,                                   INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED,                                       CENTER_DEATH_MURDER_TYPEFRAGGED,                                INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST,                                        CENTER_DEATH_MURDER_FRAG_FIRST,                                 INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST,                                     CENTER_DEATH_MURDER_FRAGGED_FIRST,                              INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST,                            CENTER_DEATH_MURDER_TYPEFRAG_FIRST,                             INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST,                         CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST,                  INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_VERBOSE,                                      CENTER_DEATH_MURDER_FRAG_VERBOSE,                               INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_VERBOSE,                           CENTER_DEATH_MURDER_FRAGGED_VERBOSE,                    INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_VERBOSE,                          CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE,                   INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_VERBOSE,                       CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE,                INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST_VERBOSE,                        CENTER_DEATH_MURDER_FRAG_FIRST_VERBOSE,                 INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST_VERBOSE,                     CENTER_DEATH_MURDER_FRAGGED_FIRST_VERBOSE,              INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE,            CENTER_DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE,             INFO_EMPTY) \
-       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE,         CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE,  INFO_EMPTY)
+       MSG_DEATH_NOTIF(DEATH_MURDER_FRAG,                                                      CENTER_DEATH_MURDER_FRAG,                                               FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED,                                           CENTER_DEATH_MURDER_FRAGGED,                                    FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG,                                          CENTER_DEATH_MURDER_TYPEFRAG,                                   FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED,                                       CENTER_DEATH_MURDER_TYPEFRAGGED,                                FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST,                                        CENTER_DEATH_MURDER_FRAG_FIRST,                                 FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST,                                     CENTER_DEATH_MURDER_FRAGGED_FIRST,                              FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST,                            CENTER_DEATH_MURDER_TYPEFRAG_FIRST,                             FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST,                         CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST,                  FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_VERBOSE,                                      CENTER_DEATH_MURDER_FRAG_VERBOSE,                               FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_VERBOSE,                           CENTER_DEATH_MURDER_FRAGGED_VERBOSE,                    FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_VERBOSE,                          CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE,                   FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_VERBOSE,                       CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE,                FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST_VERBOSE,                        CENTER_DEATH_MURDER_FRAG_FIRST_VERBOSE,                 FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST_VERBOSE,                     CENTER_DEATH_MURDER_FRAGGED_FIRST_VERBOSE,              FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE,            CENTER_DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE,             FALSE) \
+       MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE,         CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE,  FALSE)
 
        
 // ====================================
@@ -421,7 +421,9 @@ string Get_Field_Value(float field, float net_type, float net_name)
                case MSG_DEATH:
                {
                        #define MSG_DEATH_NOTIF(name,centername,infoname) \
-                               { NOTIF_MATCH(name, net_name) { GET_FIELD_VALUE_OUTPUT(field,name,stof(Get_Field_Value(F_STRNUM, MSG_CENTER, centername)),stof(Get_Field_Value(F_FLNUM, MSG_INFO, infoname))) } }
+                               { NOTIF_MATCH(name, net_name) { GET_FIELD_VALUE_OUTPUT(field,name, \
+                               max(stof(Get_Field_Value(F_STRNUM, MSG_CENTER, centername)), stof(Get_Field_Value(F_STRNUM, MSG_INFO, infoname))), \
+                               max(stof(Get_Field_Value(F_FLNUM, MSG_CENTER, centername)), stof(Get_Field_Value(F_FLNUM, MSG_INFO, infoname)))) } }
                        MSG_DEATH_NOTIFICATIONS
                        #undef MSG_DEATH_NOTIF
                        break;
@@ -434,6 +436,7 @@ string Get_Field_Value(float field, float net_type, float net_name)
 
 // team code replace
 string TCR(string input, string teamcolor, string teamtext)
+
 {
        input = strreplace("^TC", teamcolor, input);
        input = strreplace("^TT", teamtext, input);
@@ -469,7 +472,7 @@ void Dump_Notifications(float fh)
        #define MSG_INFO_NOTIF(name,strnum,flnum,args,hudargs,icon,normal,gentle) { NOTIF_Write("MSG_INFO", VAR_TO_TEXT(name), normal); }
        #define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) { NOTIF_Write("MSG_CENTER", VAR_TO_TEXT(name), normal); }
        #define MSG_WEAPON_NOTIF(name,strnum,flnum,args,normal,gentle) { NOTIF_Write("MSG_WEAPON", VAR_TO_TEXT(name), normal); }
-       #define MSG_DEATH_NOTIF(name,centername,infoname) { NOTIF_Write("MSG_DEATH", VAR_TO_TEXT(name), "fixme"); }
+       #define MSG_DEATH_NOTIF(name,centername,infoname) { NOTIF_Write("MSG_DEATH", VAR_TO_TEXT(name), sprintf("centername: %s, infoname: %s", VAR_TO_TEXT(centername), VAR_TO_TEXT(infoname))); }
        MSG_INFO_NOTIFICATIONS
        MSG_CENTER_NOTIFICATIONS
        MSG_WEAPON_NOTIFICATIONS
@@ -559,7 +562,12 @@ void Local_Notification(float net_type, float net_name, string s1, string s2, fl
                        #define MSG_DEATH_NOTIF(name,centername,infoname) \
                                { NOTIF_MATCH(name, net_name) CHECK_AUTOCVAR(name) \
                                { \
-                                       print("idek what to do.\n"); \
+                                       #if centername != 0 \
+                                               Local_Notification(MSG_CENTER, centername, s1, s2, f1, f2, f3); \
+                                       #endif \
+                                       #if infoname != 0 \
+                                               Local_Notification(MSG_INFO, infoname, s1, s2, f1, f2, f3); \
+                                       #endif \
                                } }
                        MSG_DEATH_NOTIFICATIONS
                        #undef MSG_DEATH_NOTIF