diff --git a/assets/japro/hud/generic.tga b/assets/japro/hud/generic.tga deleted file mode 100644 index 1e8ea31a16..0000000000 Binary files a/assets/japro/hud/generic.tga and /dev/null differ diff --git a/assets/japro/hud/mod/DEMP2.png b/assets/japro/hud/mod/DEMP2.png new file mode 100644 index 0000000000..684701eb78 Binary files /dev/null and b/assets/japro/hud/mod/DEMP2.png differ diff --git a/assets/japro/hud/mod/DEMP2_alt.png b/assets/japro/hud/mod/DEMP2_alt.png new file mode 100644 index 0000000000..643cfb0fdf Binary files /dev/null and b/assets/japro/hud/mod/DEMP2_alt.png differ diff --git a/assets/japro/hud/mod/bowcaster.png b/assets/japro/hud/mod/bowcaster.png new file mode 100644 index 0000000000..af5fae1ea8 Binary files /dev/null and b/assets/japro/hud/mod/bowcaster.png differ diff --git a/assets/japro/hud/mod/concussion.png b/assets/japro/hud/mod/concussion.png new file mode 100644 index 0000000000..50cfea02c1 Binary files /dev/null and b/assets/japro/hud/mod/concussion.png differ diff --git a/assets/japro/hud/mod/concussion_alt.png b/assets/japro/hud/mod/concussion_alt.png new file mode 100644 index 0000000000..5c3c4fd868 Binary files /dev/null and b/assets/japro/hud/mod/concussion_alt.png differ diff --git a/assets/japro/hud/mod/crushed.png b/assets/japro/hud/mod/crushed.png new file mode 100644 index 0000000000..765452f9b5 Binary files /dev/null and b/assets/japro/hud/mod/crushed.png differ diff --git a/assets/japro/hud/mod/detpack.png b/assets/japro/hud/mod/detpack.png new file mode 100644 index 0000000000..00de423b6f Binary files /dev/null and b/assets/japro/hud/mod/detpack.png differ diff --git a/assets/japro/hud/mod/disruptor.png b/assets/japro/hud/mod/disruptor.png new file mode 100644 index 0000000000..11113865c4 Binary files /dev/null and b/assets/japro/hud/mod/disruptor.png differ diff --git a/assets/japro/hud/mod/disruptor_alt.png b/assets/japro/hud/mod/disruptor_alt.png new file mode 100644 index 0000000000..848a340776 Binary files /dev/null and b/assets/japro/hud/mod/disruptor_alt.png differ diff --git a/assets/japro/hud/mod/fall.png b/assets/japro/hud/mod/fall.png new file mode 100644 index 0000000000..dfffc1a699 Binary files /dev/null and b/assets/japro/hud/mod/fall.png differ diff --git a/assets/japro/hud/mod/flechette.png b/assets/japro/hud/mod/flechette.png new file mode 100644 index 0000000000..1501796fe8 Binary files /dev/null and b/assets/japro/hud/mod/flechette.png differ diff --git a/assets/japro/hud/mod/flechette_alt.png b/assets/japro/hud/mod/flechette_alt.png new file mode 100644 index 0000000000..1e44faa9ba Binary files /dev/null and b/assets/japro/hud/mod/flechette_alt.png differ diff --git a/assets/japro/hud/mod/force.png b/assets/japro/hud/mod/force.png new file mode 100644 index 0000000000..99f6e7c0bb Binary files /dev/null and b/assets/japro/hud/mod/force.png differ diff --git a/assets/japro/hud/mod/generic.png b/assets/japro/hud/mod/generic.png new file mode 100644 index 0000000000..9f17b025b7 Binary files /dev/null and b/assets/japro/hud/mod/generic.png differ diff --git a/assets/japro/hud/mod/lava.png b/assets/japro/hud/mod/lava.png new file mode 100644 index 0000000000..3c593b6b03 Binary files /dev/null and b/assets/japro/hud/mod/lava.png differ diff --git a/assets/japro/hud/mod/melee.png b/assets/japro/hud/mod/melee.png new file mode 100644 index 0000000000..a1cfa6b5e8 Binary files /dev/null and b/assets/japro/hud/mod/melee.png differ diff --git a/assets/japro/hud/mod/merrsonn.png b/assets/japro/hud/mod/merrsonn.png new file mode 100644 index 0000000000..0721968c1c Binary files /dev/null and b/assets/japro/hud/mod/merrsonn.png differ diff --git a/assets/japro/hud/mod/merrsonn_alt.png b/assets/japro/hud/mod/merrsonn_alt.png new file mode 100644 index 0000000000..f821aeb833 Binary files /dev/null and b/assets/japro/hud/mod/merrsonn_alt.png differ diff --git a/assets/japro/hud/mod/mine.png b/assets/japro/hud/mod/mine.png new file mode 100644 index 0000000000..38de0b9d0d Binary files /dev/null and b/assets/japro/hud/mod/mine.png differ diff --git a/assets/japro/hud/mod/ooze.png b/assets/japro/hud/mod/ooze.png new file mode 100644 index 0000000000..0a0ae2872b Binary files /dev/null and b/assets/japro/hud/mod/ooze.png differ diff --git a/assets/japro/hud/mod/pistol.png b/assets/japro/hud/mod/pistol.png new file mode 100644 index 0000000000..a508500a45 Binary files /dev/null and b/assets/japro/hud/mod/pistol.png differ diff --git a/assets/japro/hud/mod/portable_turret.png b/assets/japro/hud/mod/portable_turret.png new file mode 100644 index 0000000000..458770a5da Binary files /dev/null and b/assets/japro/hud/mod/portable_turret.png differ diff --git a/assets/japro/hud/mod/repeater.png b/assets/japro/hud/mod/repeater.png new file mode 100644 index 0000000000..75efb86215 Binary files /dev/null and b/assets/japro/hud/mod/repeater.png differ diff --git a/assets/japro/hud/mod/repeater_alt.png b/assets/japro/hud/mod/repeater_alt.png new file mode 100644 index 0000000000..2917fb3453 Binary files /dev/null and b/assets/japro/hud/mod/repeater_alt.png differ diff --git a/assets/japro/hud/mod/rifle.png b/assets/japro/hud/mod/rifle.png new file mode 100644 index 0000000000..f409f950f0 Binary files /dev/null and b/assets/japro/hud/mod/rifle.png differ diff --git a/assets/japro/hud/mod/saber.png b/assets/japro/hud/mod/saber.png new file mode 100644 index 0000000000..5382ff86b2 Binary files /dev/null and b/assets/japro/hud/mod/saber.png differ diff --git a/assets/japro/hud/mod/stun.png b/assets/japro/hud/mod/stun.png new file mode 100644 index 0000000000..eb040c60ad Binary files /dev/null and b/assets/japro/hud/mod/stun.png differ diff --git a/assets/japro/hud/mod/swoop.png b/assets/japro/hud/mod/swoop.png new file mode 100644 index 0000000000..7b8caffb41 Binary files /dev/null and b/assets/japro/hud/mod/swoop.png differ diff --git a/assets/japro/hud/mod/telefrag.png b/assets/japro/hud/mod/telefrag.png new file mode 100644 index 0000000000..8b62e666a6 Binary files /dev/null and b/assets/japro/hud/mod/telefrag.png differ diff --git a/assets/japro/hud/mod/thermal.png b/assets/japro/hud/mod/thermal.png new file mode 100644 index 0000000000..6c7d8d442a Binary files /dev/null and b/assets/japro/hud/mod/thermal.png differ diff --git a/assets/japro/hud/mod/turret.png b/assets/japro/hud/mod/turret.png new file mode 100644 index 0000000000..c421d6993e Binary files /dev/null and b/assets/japro/hud/mod/turret.png differ diff --git a/assets/japro/hud/mod/water.png b/assets/japro/hud/mod/water.png new file mode 100644 index 0000000000..86032603ae Binary files /dev/null and b/assets/japro/hud/mod/water.png differ diff --git a/assets/japro/hud/telefrag.tga b/assets/japro/hud/telefrag.tga deleted file mode 100644 index c2d4ab57f0..0000000000 Binary files a/assets/japro/hud/telefrag.tga and /dev/null differ diff --git a/codemp/cgame/hud_shared.c b/codemp/cgame/hud_shared.c index eb9e8a1b0b..8cafe941f7 100644 --- a/codemp/cgame/hud_shared.c +++ b/codemp/cgame/hud_shared.c @@ -48,44 +48,44 @@ const char *hud_weapon_icons[WP_NUM_WEAPONS] = { const char *hud_mod_icons[ MOD_MAX ] = { "hud/mod/generic", // MOD_UNKNOWN - "gfx/hud/w_icon_stunbaton", // MOD_STUN_BATON - "gfx/hud/w_icon_melee", // MOD_MELEE - "gfx/hud/w_icon_lightsaber", // MOD_SABER - "gfx/hud/w_icon_blaster_pistol", // MOD_BRYAR_PISTOL - "gfx/hud/w_icon_blaster_pistol", // MOD_BRYAR_PISTOL_ALT - "gfx/hud/w_icon_blaster", // MOD_BLASTER - "gfx/hud/w_icon_blaster", // MOD_TURBLAST - "gfx/hud/w_icon_disruptor", // MOD_DISRUPTOR - "gfx/hud/w_icon_disruptor", // MOD_DISRUPTOR_SPLASH - "gfx/hud/w_icon_disruptor", // MOD_DISRUPTOR_SNIPER - "gfx/hud/w_icon_bowcaster", // MOD_BOWCASTER - "gfx/hud/w_icon_repeater", // MOD_REPEATER - "gfx/hud/w_icon_repeater", // MOD_REPEATER_ALT - "gfx/hud/w_icon_repeater", // MOD_REPEATER_ALT_SPLASH - "gfx/hud/w_icon_demp2", // MOD_DEMP2 - "gfx/hud/w_icon_demp2", // MOD_DEMP2_ALT - "gfx/hud/w_icon_flachette", // MOD_FLECHETTE - "gfx/hud/w_icon_flachette", // MOD_FLECHETTE_ALT_SPLASH - "gfx/hud/w_icon_merrsonn", // MOD_ROCKET - "gfx/hud/w_icon_merrsonn", // MOD_ROCKET_SPLASH - "gfx/hud/w_icon_merrsonn", // MOD_ROCKET_HOMING - "gfx/hud/w_icon_merrsonn", // MOD_ROCKET_HOMING_SPLASH - "gfx/hud/w_icon_thermal", // MOD_THERMAL - "gfx/hud/w_icon_thermal", // MOD_THERMAL_SPLASH - "gfx/hud/w_icon_tripmine", // MOD_TRIP_MINE_SPLASH - "gfx/hud/w_icon_tripmine", // MOD_TIMED_MINE_SPLASH - "gfx/hud/w_icon_detpack", // MOD_DET_PACK_SPLASH - "hud/mod/generic", // MOD_VEHICLE - "gfx/hud/w_icon_melee", // MOD_CONC - "gfx/hud/w_icon_melee", // MOD_CONC_ALT - "hud/mod/generic", // MOD_FORCE_DARK - "hud/mod/i_icon_sentrygun", // MOD_SENTRY - "hud/mod/generic", // MOD_WATER - "hud/mod/generic", // MOD_SLIME - "hud/mod/generic", // MOD_LAVA - "hud/mod/generic", // MOD_CRUSH + "hud/mod/stun", // MOD_STUN_BATON + "hud/mod/melee", // MOD_MELEE + "hud/mod/saber", // MOD_SABER + "hud/mod/pistol", // MOD_BRYAR_PISTOL + "hud/mod/pistol", // MOD_BRYAR_PISTOL_ALT + "hud/mod/rifle", // MOD_BLASTER + "hud/mod/rifle", // MOD_TURBLAST + "hud/mod/disruptor", // MOD_DISRUPTOR + "hud/mod/disruptor", // MOD_DISRUPTOR_SPLASH + "hud/mod/disruptor_alt", // MOD_DISRUPTOR_SNIPER + "hud/mod/bowcaster", // MOD_BOWCASTER + "hud/mod/repeater", // MOD_REPEATER + "hud/mod/repeater_alt", // MOD_REPEATER_ALT + "hud/mod/repeater_alt", // MOD_REPEATER_ALT_SPLASH + "hud/mod/demp2", // MOD_DEMP2 + "hud/mod/demp2_alt", // MOD_DEMP2_ALT + "hud/mod/flachette", // MOD_FLECHETTE + "hud/mod/flachette_alt", // MOD_FLECHETTE_ALT_SPLASH + "hud/mod/merrsonn", // MOD_ROCKET + "hud/mod/merrsonn", // MOD_ROCKET_SPLASH + "hud/mod/merrsonn_alt", // MOD_ROCKET_HOMING + "hud/mod/merrsonn_alt", // MOD_ROCKET_HOMING_SPLASH + "hud/mod/thermal", // MOD_THERMAL + "hud/mod/thermal_alt", // MOD_THERMAL_SPLASH + "hud/mod/mine", // MOD_TRIP_MINE_SPLASH + "hud/mod/mine", // MOD_TIMED_MINE_SPLASH + "hud/mod/detpack", // MOD_DET_PACK_SPLASH + "hud/mod/swoop", // MOD_VEHICLE + "hud/mod/concussion", // MOD_CONC + "hud/mod/concussion_alt", // MOD_CONC_ALT + "hud/mod/force", // MOD_FORCE_DARK + "hud/mod/portable_turret", // MOD_SENTRY + "hud/mod/water", // MOD_WATER + "hud/mod/ooze", // MOD_SLIME + "hud/mod/lava", // MOD_LAVA + "hud/mod/crushed", // MOD_CRUSH "hud/mod/telefrag", // MOD_TELEFRAG - "hud/mod/generic", // MOD_FALLING + "hud/mod/fall", // MOD_FALLING "hud/mod/generic", // MOD_SUICIDE "hud/mod/generic", // MOD_TARGET_LASER "hud/mod/generic", // MOD_TRIGGER_HURT