Items: fix blank weapon names
authorTimePath <andrew.hardaker1995@gmail.com>
Tue, 13 Oct 2015 10:16:15 +0000 (21:16 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Tue, 13 Oct 2015 10:16:15 +0000 (21:16 +1100)
qcsrc/client/hud.qc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc

index 0e52460..9d1e27a 100644 (file)
@@ -721,7 +721,7 @@ void HUD_Weapons(void)
                                        break;
 
                                case 3: // weapon name
-                                       drawstring(weapon_pos, strtolower(self.message), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                                       drawstring(weapon_pos, strtolower(self.m_name), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                                        break;
 
                                default: // nothing
index 89d1b23..f63cc4b 100644 (file)
@@ -255,7 +255,7 @@ vector spritelookupcolor(entity this, string s, vector def)
 string spritelookuptext(string s)
 {SELFPARAM();
     if (s == WP_RaceStartFinish.netname) return (race_checkpointtime || race_mycheckpointtime) ? _("Finish") : _("Start");
-    if (s == WP_Weapon.netname) return get_weaponinfo(self.wp_extra).message;
+    if (s == WP_Weapon.netname) return get_weaponinfo(self.wp_extra).m_name;
     if (s == WP_Item.netname) return Items[self.wp_extra].m_waypoint;
     if (s == WP_Buff.netname) return Buffs[self.wp_extra].m_prettyName;
     if (s == WP_Monster.netname) return get_monsterinfo(self.wp_extra).monster_name;