From 26a814aa3891e51a886d0bf3d0c20809e5c4a304 Mon Sep 17 00:00:00 2001 From: InspirationByte Date: Wed, 2 Feb 2022 08:41:02 +0300 Subject: [PATCH] - MP mission timer, target blip height adjusted for NTSC/PAL --- src_rebuild/Game/C/mission.c | 2 +- src_rebuild/Game/C/overmap.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src_rebuild/Game/C/mission.c b/src_rebuild/Game/C/mission.c index 93afbd38..050a7864 100644 --- a/src_rebuild/Game/C/mission.c +++ b/src_rebuild/Game/C/mission.c @@ -536,7 +536,7 @@ void LoadMission(int missionnum) Mission.timer[0].x = Mission.timer[1].x = 124; Mission.timer[0].y = 16; - Mission.timer[1].y = 136; + Mission.timer[1].y = SCREEN_H / 2 + 8; if (MissionHeader->timer || (MissionHeader->timerFlags & MISSIONTIMER_FLAG_COUNTER)) { diff --git a/src_rebuild/Game/C/overmap.c b/src_rebuild/Game/C/overmap.c index b98c9fd8..16018e36 100644 --- a/src_rebuild/Game/C/overmap.c +++ b/src_rebuild/Game/C/overmap.c @@ -115,8 +115,8 @@ void DrawTargetBlip(VECTOR *pos, u_char r, u_char g, u_char b, int flags) { WorldToMultiplayerMap(pos, &vec); - vec.vx += gMapXOffset; - vec.vz += 96; + vec.vx += map_minX; + vec.vz += map_minY; } else if (flags & 0x8) { @@ -300,7 +300,7 @@ void DrawPlayerDot(VECTOR *pos, short rot, u_char r, u_char g, u_char b, int fla WorldToMultiplayerMap(pos, &vec); vec.vx += gMapXOffset; - vec.vz += 96; + vec.vz += gMapYOffset; } else { @@ -912,9 +912,9 @@ void InitOverheadMap(void) int tpage; if (NumPlayers > 1) - gMapYOffset = (SCREEN_H - MAP_SIZE_H) / 2 - 2;// 96; + gMapYOffset = (SCREEN_H - MAP_SIZE_H) / 2 - 2; else - gMapYOffset = SCREEN_H - MAP_SIZE_H - 15; //181; + gMapYOffset = SCREEN_H - MAP_SIZE_H - 15; if (gMultiplayerLevels) {