archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-16 07:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into miami

Browse Source
This commit is contained in:
Sergeanur
2020-07-29 15:35:25 +03:00
parent acdc52116e e13d80a4eb
commit 86cc86ac12
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/Game.cpp
View File

@ -156,9 +156,9 @@ CGame::InitialiseOnceBeforeRW(void)
#ifdef PS2_MATFX
void ReplaceMatFxCallback();
#endif // PS2_MATFX
#ifdef DUAL_PASS_RENDERING
#ifdef PS2_ALPHA_TEST
void ReplaceAtomicPipeCallback();
#endif // DUAL_PASS_RENDERING
#endif // PS2_ALPHA_TEST
#endif // !LIBRW
bool
@ -215,9 +215,9 @@ CGame::InitialiseRenderWare(void)
#ifdef PS2_MATFX
ReplaceMatFxCallback();
#endif // PS2_MATFX
#ifdef DUAL_PASS_RENDERING
#ifdef PS2_ALPHA_TEST
ReplaceAtomicPipeCallback();
#endif // DUAL_PASS_RENDERING
#endif // PS2_ALPHA_TEST
#endif // LIBRW
CFont::Initialise();

2
src/core/config.h
View File

@ -214,7 +214,7 @@ enum Config {
#define ASPECT_RATIO_SCALE // Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
#define USE_TXD_CDIMAGE // generate and load textures from txd.img
#define DUAL_PASS_RENDERING // dual pass rendering from SkyGfx
#define PS2_ALPHA_TEST // emulate ps2 alpha test
#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number
//#define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time
//#define NO_ISLAND_LOADING // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU