From: Samual Lenks Date: Tue, 12 Feb 2013 09:47:45 +0000 (-0500) Subject: Slight cleanup X-Git-Tag: xonotic-v0.7.0~62^2~23^2~225 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9cca0a566cbdd6eb89fcf7d6c4fb706a668bb0c6;p=xonotic%2Fxonotic-data.pk3dir.git Slight cleanup --- diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc index d9dc09bfa..1055fc807 100644 --- a/qcsrc/common/notifications.qc +++ b/qcsrc/common/notifications.qc @@ -146,10 +146,15 @@ void Dump_Notifications(float fh, float alsoprint) for(i = 0; i < NOTIF_INFO_COUNT; ++i) { e = Get_Notif_Ent(MSG_INFO, i); NOTIF_WRITE(MSG_INFO, e.nent_name, e.nent_normal); } for(i = 0; i < NOTIF_CENTER_COUNT; ++i) { e = Get_Notif_Ent(MSG_CENTER, i); NOTIF_WRITE(MSG_CENTER, e.nent_name, e.nent_normal); } - for(i = 0; i < NOTIF_WEAPON_COUNT; ++i) { e = Get_Notif_Ent(MSG_WEAPON, i); NOTIF_WRITE(MSG_WEAPON, e.nent_name, - sprintf("infoname: %s, centername: %s", Get_Notif_Name(MSG_INFO, Get_Notif_Infval(MSG_WEAPON, i)), Get_Notif_Name(MSG_CENTER, Get_Notif_Cenval(MSG_WEAPON, i)))); } - for(i = 0; i < NOTIF_DEATH_COUNT; ++i) { e = Get_Notif_Ent(MSG_DEATH, i); NOTIF_WRITE(MSG_DEATH, e.nent_name, - sprintf("infoname: %s, centername: %s", Get_Notif_Name(MSG_INFO, Get_Notif_Infval(MSG_DEATH, i)), Get_Notif_Name(MSG_CENTER, Get_Notif_Cenval(MSG_DEATH, i)))); } + + for(i = 0; i < NOTIF_WEAPON_COUNT; ++i) { e = Get_Notif_Ent(MSG_WEAPON, i); NOTIF_WRITE(MSG_WEAPON, e.nent_name, sprintf("infoname: %s, centername: %s", + Get_Notif_Name(MSG_INFO, Get_Notif_Infval(MSG_WEAPON, i)), + Get_Notif_Name(MSG_CENTER, Get_Notif_Cenval(MSG_WEAPON, i)))); } + + for(i = 0; i < NOTIF_DEATH_COUNT; ++i) { e = Get_Notif_Ent(MSG_DEATH, i); NOTIF_WRITE(MSG_DEATH, e.nent_name, sprintf("infoname: %s, centername: %s", + Get_Notif_Name(MSG_INFO, Get_Notif_Infval(MSG_DEATH, i)), + Get_Notif_Name(MSG_CENTER, Get_Notif_Cenval(MSG_DEATH, i)))); } + #endif print(sprintf("Notification counts: MSG_INFO = %d, MSG_CENTER = %d, MSG_WEAPON = %d, MSG_DEATH = %d\n", diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 3d60579dd..23784363e 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -658,8 +658,7 @@ entity msg_death_notifs[NOTIF_MAX]; #if (infoname == NO_MSG) && (centername == NO_MSG) \ print(sprintf("^1NOTIFICATION WITH NO SUBCALLS: ^7net_type = MSG_%s, net_name = %s.\n", strtoupper(#type), #name)); \ #else \ - float infoname_stringcount = 0, infoname_floatcount = 0; \ - float centername_stringcount = 0, centername_floatcount = 0; \ + float infoname_stringcount = 0, infoname_floatcount = 0, centername_stringcount = 0, centername_floatcount = 0; \ #if (infoname != NO_MSG) \ notif.nent_infoname = infoname; \ infoname_stringcount = msg_info_notifs[infoname - 1].nent_stringcount; \