Merge branch 'port' of https://github.com/Phnod/perfect_dark into zoom-hud-fov

# Conflicts:
#	src/include/data.h

src/include/data.h

@@ -528,7 +528,9 @@ extern struct menudialogdef g_HtDetailsMenuDialog;
 extern struct menudialogdef g_HtFailedMenuDialog;
 extern struct menudialogdef g_HtCompletedMenuDialog;
 extern struct menudialogdef g_HangarListMenuDialog;
+
 #ifndef PLATFORM_N64
+
 extern f32 g_PlayerCrosshairSway;
 extern f32 g_PlayerDefaultFovY;
 extern s32 g_PlayerMouseAimMode;
@@ -536,6 +538,14 @@ extern f32 g_PlayerMouseAimSpeedX;
 extern f32 g_PlayerMouseAimSpeedY;
 extern s32 g_PlayerFovAffectsZoom;
 extern f32 g_PlayerFovZoomMultiplier;
+extern u32 g_TexFilter2D;
+
+#define TEX_FILTER_2D g_TexFilter2D
+
+#else
+
+#define TEX_FILTER_2D G_TF_BILERP
+
 #endif
 
 #ifdef PLATFORM_N64

src/include/game/mainmenu.h

@@ -10,6 +10,9 @@ extern struct menudialogdef g_AcceptMissionMenuDialog;
 extern struct menudialogdef g_PreAndPostMissionBriefingMenuDialog;
 extern struct menudialogdef g_RetryMissionMenuDialog;
 extern struct menudialogdef g_NextMissionMenuDialog;
+#ifndef PLATFORM_N64
+extern struct menudialogdef g_ExitGameMenuDialog;
+#endif
 
 char *menuTextCurrentStageName(struct menuitem *item);
 char *soloMenuTextDifficulty(struct menuitem *item);

src/include/gbiex.h

@@ -201,6 +201,7 @@
 #define G_ASPECT_RIGHT_EXT   0x00000020
 #define G_ASPECT_CENTER_EXT  (G_ASPECT_LEFT_EXT | G_ASPECT_RIGHT_EXT)
 #define G_ASPECT_MODE_EXT    G_ASPECT_CENTER_EXT
+#define G_NO_CLIPPING_EXT    0x00000040
 
 /* Extended command macros */