From 9d80ae64b8380040046cfdecfe09e8c28bab6a0d Mon Sep 17 00:00:00 2001 From: RD42 <42702181+dashr9230@users.noreply.github.com> Date: Wed, 14 Aug 2024 23:01:03 +0800 Subject: [PATCH] [saco] Match `CGame::CreateRadarMarkerIcon(...)` --- saco/game/game.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/saco/game/game.cpp b/saco/game/game.cpp index cbac583..49be8e3 100644 --- a/saco/game/game.cpp +++ b/saco/game/game.cpp @@ -653,27 +653,26 @@ void CGame::DisableRaceCheckpoint() DWORD CGame::CreateRadarMarkerIcon(int iMarkerType, float fX, float fY, float fZ, DWORD dwColor, int iStyle) { DWORD dwMarkerID=0; - switch(iStyle) { - case MAPICON_LOCAL: + + if(iStyle == MAPICON_LOCAL) { ScriptCommand(&create_radar_marker_without_sphere, fX, fY, fZ, iMarkerType, &dwMarkerID); - break; - case MAPICON_GLOBAL: + } else if(iStyle == MAPICON_GLOBAL) { ScriptCommand(&create_marker_at, fX, fY, fZ, iMarkerType, &dwMarkerID); - break; - case MAPICON_LOCAL_CHECKPOINT: + } else if(iStyle == MAPICON_LOCAL_CHECKPOINT) { ScriptCommand(&create_radar_marker_icon, fX, fY, fZ, iMarkerType, &dwMarkerID); - break; - case MAPICON_GLOBAL_CHECKPOINT: + } else if(iStyle == MAPICON_GLOBAL_CHECKPOINT) { ScriptCommand(&create_icon_marker_sphere, fX, fY, fZ, iMarkerType, &dwMarkerID); - break; + } else { + ScriptCommand(&create_radar_marker_without_sphere, fX, fY, fZ, iMarkerType, &dwMarkerID); } + if(iMarkerType == 0) { - if(dwColor >= 1004) { - ScriptCommand(&set_marker_color, dwMarkerID, dwColor); - ScriptCommand(&show_on_radar, dwMarkerID, 3); - } else { + if(dwColor < 1004) { ScriptCommand(&set_marker_color, dwMarkerID, dwColor); ScriptCommand(&show_on_radar, dwMarkerID, 2); + } else { + ScriptCommand(&set_marker_color, dwMarkerID, dwColor); + ScriptCommand(&show_on_radar, dwMarkerID, 3); } } return dwMarkerID;