Minor improvements for NX

- Minimap size increased by 30%.
 - Recolor waypoint marker.
- Remove the "Back" button from the map menu page.

src/core/MenuScreensCustom.cpp

@@ -483,7 +483,7 @@ CMenuScreenCustom aScreens[] = {
 
 	// MENUPAGE_MAP = 6
 	{ "FEH_MAP", MENUPAGE_NONE, nil, nil,
-		 MENUACTION_GOBACK,	"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 70, 380, MENUALIGN_CENTER,
+		 //MENUACTION_GOBACK,	"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 70, 380, MENUALIGN_CENTER,
 	},
 
 	// MENUPAGE_NEW_GAME_RELOAD = 7

src/core/Radar.cpp

@@ -1100,38 +1100,34 @@ CRadar::LoadTextures()
 	WaypointSprite.SetTexture("radar_waypoint");
 	if(!WaypointSprite.m_pTexture) {
 		// create the texture if it's missing in TXD
-#define WAYPOINT_R (255)
-#define WAYPOINT_G (72)
-#define WAYPOINT_B (77)
-
+		#define WAYPOINT_R (255)
+		#define WAYPOINT_G (250)
+		#define WAYPOINT_B (115)
+		
 		RwRaster *raster = RwRasterCreate(16, 16, 0, rwRASTERTYPETEXTURE | rwRASTERFORMAT8888);
-
 		RwUInt32 *pixels = (RwUInt32 *)RwRasterLock(raster, 0, rwRASTERLOCKWRITE);
-		for(int x = 0; x < 16; x++)
-			for(int y = 0; y < 16; y++)
-			{
-				int x2 = x < 8 ? x : 7 - (x & 7);
-				int y2 = y < 8 ? y : 7 - (y & 7);
-				if ((y2 >= 4 && x2 >= 4) // square in the center is transparent
-					|| (x2 < 2 && y2 == 0) // two pixels on each side of first/last line are transparent
-					|| (x2 < 1 && y2 == 1)) // one pixel on each side of second to first/last line is transparent
-					pixels[x + y * 16] = 0;
-				else if((x2 == 2 && y2 >= 2)|| (y2 == 2 && x2 >= 2) )// colored square inside
-#ifdef RW_GL3
+		
+		for (int x = 0; x < 16; x++) {
+			for (int y = 0; y < 16; y++) {
+				if (x < 4 || x >= 12 || y < 4 || y >= 12) {
+					pixels[x + y * 16] = 0; // Transparent border
+				} else {
+		#ifdef RW_GL3
 					pixels[x + y * 16] = WAYPOINT_R | (WAYPOINT_G << 8) | (WAYPOINT_B << 16) | (255 << 24);
-#else
+		#else
 					pixels[x + y * 16] = WAYPOINT_B | (WAYPOINT_G << 8) | (WAYPOINT_R << 16) | (255 << 24);
-#endif
-				else
-					pixels[x + y * 16] = 0xFF000000; // black
+		#endif
+				}
 			}
+		}
+		
 		RwRasterUnlock(raster);
 		WaypointSprite.m_pTexture = RwTextureCreate(raster);
 		RwTextureSetFilterMode(WaypointSprite.m_pTexture, rwFILTERLINEAR);
-#undef WAYPOINT_R
-#undef WAYPOINT_G
-#undef WAYPOINT_B
-	}
+		#undef WAYPOINT_R
+		#undef WAYPOINT_G
+		#undef WAYPOINT_B
+			}
 #endif
 	CTxdStore::PopCurrentTxd();
 }
@@ -1379,11 +1375,11 @@ void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &i
 		out.y = (FrontEndMenuManager.m_fMapCenterY - FrontEndMenuManager.m_fMapSize) + (MENU_MAP_LENGTH / 2 - MENU_MAP_TOP_OFFSET - in.y) * FrontEndMenuManager.m_fMapSize * MENU_MAP_HEIGHT_SCALE * 2.0f / MENU_MAP_LENGTH;
 	} else {
 #ifdef FIX_BUGS
-		out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH) + SCREEN_SCALE_X(RADAR_LEFT);
+		out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH * 1.3f) + SCREEN_SCALE_X(RADAR_LEFT);
 #else
-		out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH) + RADAR_LEFT;
+		out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH * 1.3f) + RADAR_LEFT;
 #endif
-		out.y = (1.0f - in.y) * 0.5f * SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);
+		out.y = (1.0f - in.y) * 0.5f * SCREEN_SCALE_Y(RADAR_HEIGHT * 1.3f) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);
 	}
 }
 

src/core/Radar.h

@@ -158,8 +158,8 @@ struct sRadarTraceSave
 #pragma pack(pop)
 
 // Values for screen space
-#define RADAR_LEFT (40.0f)
-#define RADAR_BOTTOM (40.0f)
+#define RADAR_LEFT (44.0f)
+#define RADAR_BOTTOM (50.0f)
 
 #ifdef FIX_RADAR
 /*

src/renderer/Hud.cpp

@@ -1065,7 +1065,7 @@ void CHud::Draw()
 			RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
 			CRadar::DrawMap();
 			if (FrontEndMenuManager.m_PrefsRadarMode != 1) {
-				CRect rect(0.0f, 0.0f, SCREEN_SCALE_X(RADAR_WIDTH), SCREEN_SCALE_Y(RADAR_HEIGHT));
+				CRect rect(0.0f, 0.0f, SCREEN_SCALE_X(RADAR_WIDTH * 1.3f), SCREEN_SCALE_Y(RADAR_HEIGHT * 1.3f));
 				
 				rect.Translate(SCREEN_SCALE_X_FIX(RADAR_LEFT), SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT));