- overhead map clipping handling for MP (fix flickering)

Author: SoapyMan

src_rebuild/Game/C/overlay.c

@@ -123,19 +123,17 @@ void InitOverlays(void)
 }
 
 // [D] [T]
-void SetFullscreenDrawing(void)
+void SetFullscreenDrawing(int ofs)
 {
 	DR_ENV *drenv;
 	DRAWENV drawenv;
 
-	drenv = (DR_ENV *)current->primptr;
-
 	drawenv.clip.x = 256;
 	SetDefDrawEnv(&drawenv, 0, current->draw.clip.y & 256, 320, 256);
 
+	drenv = (DR_ENV*)current->primptr;
 	SetDrawEnv(drenv, &drawenv);
-
-	addPrim(current->ot + 2, drenv);
+	addPrim(current->ot + ofs, drenv);
 	current->primptr += sizeof(DR_ENV);
 }
 
@@ -704,7 +702,7 @@ void DisplayOverlays(void)
 		if (CurrentPlayerView == 0)
 			return;
 
-		SetFullscreenDrawing();
+		SetFullscreenDrawing(2);
 	}
 
 	UpdateFlashValue();

src_rebuild/Game/C/overlay.h

@@ -36,7 +36,7 @@ extern char OverlayFlashValue;
 extern void InitOverlays(); // 0x00014A58
 extern void DisplayOverlays(); // 0x00014C3C
 
-extern void SetFullscreenDrawing(); // 0x00015E70
+extern void SetFullscreenDrawing(int ofs); // 0x00015E70
 
 extern void InitPercentageBar(PERCENTAGE_BAR *bar, int size, COLOUR_BAND *pColourBand, char *tag); // 0x00015F20
 extern void EnablePercentageBar(PERCENTAGE_BAR *bar, int max); // 0x00015F58

src_rebuild/Game/C/overmap.c

@@ -1173,12 +1173,7 @@ void DrawOverheadMap(void)
 		}
 	}
 
-	// for restoring
-	drarea = (DR_AREA *)current->primptr;
-	SetDrawArea(drarea, &current->draw.clip);
-
-	addPrim(current->ot + 1, drarea);
-	current->primptr += sizeof(DR_AREA);
+	SetFullscreenDrawing(1);
 
 	WorldToOverheadMapPositions((VECTOR *)player->pos, &vec, 1, 0, 0);
 
@@ -1448,7 +1443,7 @@ void DrawOverheadMap(void)
 	clipped_size.x = map_minX + 1;
 	clipped_size.w = MAP_SIZE_W - 1;
 	clipped_size.h = MAP_SIZE_H;
-	clipped_size.y = current->draw.clip.y + map_minY;// +1;
+	clipped_size.y = (current->draw.clip.y & 256) + map_minY;
 
 	drarea = (DR_AREA*)current->primptr;
 

src_rebuild/Game/C/pause.c

@@ -1061,7 +1061,7 @@ void DrawVisibleMenus(void)
 
 	if (NumPlayers > 1)
 	{
-		SetFullscreenDrawing();
+		SetFullscreenDrawing(2);
 	}
 
 	pActive = VisibleMenus[VisibleMenu];