From fe29da78e90b82c28c5d8f84f06bbba0bcbce715 Mon Sep 17 00:00:00 2001 From: Ilya Shurumov Date: Sun, 6 Jun 2021 12:10:57 +0600 Subject: [PATCH] - change MP map logic a bit --- src_rebuild/Game/C/overlay.c | 2 +- src_rebuild/Game/C/overmap.c | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src_rebuild/Game/C/overlay.c b/src_rebuild/Game/C/overlay.c index 12adee1f..52de11f9 100644 --- a/src_rebuild/Game/C/overlay.c +++ b/src_rebuild/Game/C/overlay.c @@ -135,7 +135,7 @@ void SetFullscreenDrawing(void) SetDrawEnv(drenv, &drawenv); - addPrim(current->ot + 4, drenv); + addPrim(current->ot + 2, drenv); current->primptr += sizeof(DR_ENV); } diff --git a/src_rebuild/Game/C/overmap.c b/src_rebuild/Game/C/overmap.c index e5e65304..03785a35 100644 --- a/src_rebuild/Game/C/overmap.c +++ b/src_rebuild/Game/C/overmap.c @@ -888,6 +888,11 @@ void InitOverheadMap(void) int c; int tpage; + if (NumPlayers > 1) + gMapYOffset = 96; + else + gMapYOffset = 181; + if (gMultiplayerLevels) { InitMultiplayerMap(); @@ -978,9 +983,6 @@ void DrawMultiplayerMap(void) else yPos = 96; - if (MissionHeader->region == 0) - return; - DrawMultiplayerTargets(); pl = player; @@ -1094,10 +1096,18 @@ void DrawOverheadMap(void) 0 }; + if (NumPlayers > 1) + { + if(MissionHeader->region != 0) + DrawMultiplayerMap(); + + return; + } + map_minX = gMapXOffset; - map_maxX = gMapXOffset + MAP_SIZE_W; map_minY = gMapYOffset; - map_maxY = gMapYOffset + MAP_SIZE_H; + map_maxX = map_minX + MAP_SIZE_W; + map_maxY = map_minY + MAP_SIZE_H; VECTOR translate = { map_minX + MAP_SIZE_W/2, @@ -1105,15 +1115,6 @@ void DrawOverheadMap(void) map_minY + MAP_SIZE_H/2 }; - if (gMultiplayerLevels) - { - DrawMultiplayerMap(); - return; - } - - if (NumPlayers > 1) - return; - SetMapPos(); draw_box(map_minY, MAP_SIZE_H); @@ -1434,8 +1435,7 @@ void DrawOverheadMap(void) drarea = (DR_AREA*)current->primptr; SetDrawArea(drarea, &clipped_size); - - addPrim(current->ot+1, drarea); + addPrim(current->ot + 1, drarea); current->primptr += sizeof(DR_AREA); }