From 63a7e0f3f4f4134f6145702d6207deb52f05d98c Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 5 Feb 2018 14:18:04 +1000 Subject: [PATCH] Show domination, keyhunt, keepaway and vehicle waypoints --- .../common/mutators/mutator/waypoints/all.inc | 22 +++++++++---------- .../mutator/waypoints/waypointsprites.qc | 1 + qcsrc/common/vehicles/sv_vehicles.qc | 1 + .../mutators/mutator/gamemode_domination.qc | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/qcsrc/common/mutators/mutator/waypoints/all.inc b/qcsrc/common/mutators/mutator/waypoints/all.inc index 407b9c35b..0e2b51946 100644 --- a/qcsrc/common/mutators/mutator/waypoints/all.inc +++ b/qcsrc/common/mutators/mutator/waypoints/all.inc @@ -29,21 +29,21 @@ REGISTER_WAYPOINT(FlagBasePink, _("Pink base"), "flag_pink_taken", '0.8 0.8 0', REGISTER_WAYPOINT(FlagReturn, _("Return flag here"), "", '0 0.8 0.8', 1); REGISTER_WAYPOINT(DomNeut, _("Control point"), "", '0 1 1', 1); -REGISTER_WAYPOINT(DomRed, _("Control point"), "", '0 1 1', 1); -REGISTER_WAYPOINT(DomBlue, _("Control point"), "", '0 1 1', 1); -REGISTER_WAYPOINT(DomYellow, _("Control point"), "", '0 1 1', 1); -REGISTER_WAYPOINT(DomPink, _("Control point"), "", '0 1 1', 1); +REGISTER_WAYPOINT(DomRed, _("Control point"), "dom_icon_red-highlighted", '0 1 1', 1); +REGISTER_WAYPOINT(DomBlue, _("Control point"), "dom_icon_blue-highlighted", '0 1 1', 1); +REGISTER_WAYPOINT(DomYellow, _("Control point"), "dom_icon_yellow-highlighted", '0 1 1', 1); +REGISTER_WAYPOINT(DomPink, _("Control point"), "dom_icon_pink-highlighted", '0 1 1', 1); -REGISTER_WAYPOINT(KeyDropped, _("Dropped key"), "", '0 1 1', 1); +REGISTER_WAYPOINT(KeyDropped, _("Dropped key"), "kh_dropped", '0 1 1', 1); REGISTER_WAYPOINT(KeyCarrierFriend, _("Key carrier"), "", '0 1 0', 1); REGISTER_WAYPOINT(KeyCarrierFinish, _("Run here"), "", '0 1 1', 1); -REGISTER_WAYPOINT(KeyCarrierRed, _("Key carrier"), "", '0 1 1', 1); -REGISTER_WAYPOINT(KeyCarrierBlue, _("Key carrier"), "", '0 1 1', 1); -REGISTER_WAYPOINT(KeyCarrierYellow, _("Key carrier"), "", '0 1 1', 1); -REGISTER_WAYPOINT(KeyCarrierPink, _("Key carrier"), "", '0 1 1', 1); +REGISTER_WAYPOINT(KeyCarrierRed, _("Key carrier"), "kh_red_carrying", '0 1 1', 1); +REGISTER_WAYPOINT(KeyCarrierBlue, _("Key carrier"), "kh_blue_carrying", '0 1 1', 1); +REGISTER_WAYPOINT(KeyCarrierYellow, _("Key carrier"), "kh_yellow_carrying", '0 1 1', 1); +REGISTER_WAYPOINT(KeyCarrierPink, _("Key carrier"), "kh_pink_carrying", '0 1 1', 1); -REGISTER_WAYPOINT(KaBall, _("Ball"), "", '0 1 1', 1); -REGISTER_WAYPOINT(KaBallCarrier, _("Ball carrier"), "", '1 0 0', 1); +REGISTER_WAYPOINT(KaBall, _("Ball"), "notify_ballpickedup", '0 1 1', 1); +REGISTER_WAYPOINT(KaBallCarrier, _("Ball carrier"), "keepawayball_carrying", '1 0 0', 1); REGISTER_WAYPOINT(NbBall, _("Ball"), "", '0.91 0.85 0.62', 1); REGISTER_WAYPOINT(NbGoal, _("Goal"), "", '1 0.5 0', 1); diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc index a5d48249a..c2f8f298e 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc @@ -272,6 +272,7 @@ string spritelookupicon(entity this, string s) if (s == WP_Weapon.netname) return Weapons_from(this.wp_extra).model2; if (s == WP_Item.netname) return Items_from(this.wp_extra).m_icon; if (s == WP_Buff.netname) return strcat("buff_", Buffs_from(this.wp_extra).m_name); + if (s == WP_Vehicle.netname) return Vehicles_from(this.wp_extra).m_icon; //if (s == WP_Monster.netname) return get_monsterinfo(this.wp_extra).m_icon; if (MUTATOR_CALLHOOK(WP_Format, this, s)) { diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc index 1fbd80210..44583c511 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qc +++ b/qcsrc/common/vehicles/sv_vehicles.qc @@ -522,6 +522,7 @@ void vehicles_showwp(entity this) else rgb = '1 1 1'; entity wp = WaypointSprite_Spawn(WP_Vehicle, 0, 0, ent, '0 0 64', NULL, 0, ent, waypointsprite_attached, true, RADARICON_Vehicle); + wp.wp_extra = ent.wp00.vehicleid; wp.colormod = rgb; if(ent.waypointsprite_attached) { diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qc b/qcsrc/server/mutators/mutator/gamemode_domination.qc index 5980cfbaf..0d302d0f6 100644 --- a/qcsrc/server/mutators/mutator/gamemode_domination.qc +++ b/qcsrc/server/mutators/mutator/gamemode_domination.qc @@ -88,7 +88,7 @@ void dompoint_captured(entity this) this.team = old_team; entity msg = WP_DomNeut; - switch(this.team) + switch(real_team) { case NUM_TEAM_1: msg = WP_DomRed; break; case NUM_TEAM_2: msg = WP_DomBlue; break; -- 2.39.2