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

# Conflicts:
#	src/include/data.h
This commit is contained in:
Phnod committed 2023-09-02 19:05:12 -04:00
commit d033a7fa02
27 files changed
+638 -170

No files matched your search

+10
View File
@@ -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