summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-20 18:41:49 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-20 18:41:49 +0200
commit35a7f89f734f2e6e09d05cd90a945982e035b14b (patch)
tree01fa4f7ed892166777f0d8f810ccdd48c2610588 /src/core
parentMerge remote-tracking branch 'upstream/master' (diff)
parentupdate librw (matfx) (diff)
downloadre3-35a7f89f734f2e6e09d05cd90a945982e035b14b.tar
re3-35a7f89f734f2e6e09d05cd90a945982e035b14b.tar.gz
re3-35a7f89f734f2e6e09d05cd90a945982e035b14b.tar.bz2
re3-35a7f89f734f2e6e09d05cd90a945982e035b14b.tar.lz
re3-35a7f89f734f2e6e09d05cd90a945982e035b14b.tar.xz
re3-35a7f89f734f2e6e09d05cd90a945982e035b14b.tar.zst
re3-35a7f89f734f2e6e09d05cd90a945982e035b14b.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Game.cpp8
-rw-r--r--src/core/config.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index b1d29161..94c775ae 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -156,6 +156,14 @@ CGame::InitialiseRenderWare(void)
LightsCreate(Scene.world);
CreateDebugFont();
+
+#ifdef LIBRW
+#ifdef PS2_MATFX
+ rw::MatFX::modulateEnvMap = true;
+#else
+ rw::MatFX::modulateEnvMap = false;
+#endif
+#endif
CFont::Initialise();
CHud::Initialise();
diff --git a/src/core/config.h b/src/core/config.h
index 4ca79cb5..b5022b9f 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -209,6 +209,7 @@ enum Config {
#define TRIANGLE_BACK_BUTTON
// #define CIRCLE_BACK_BUTTON
#define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better.
+#define BETA_SLIDING_TEXT
// Script
#define USE_DEBUG_SCRIPT_LOADER // makes game load main_freeroam.scm by default
@@ -225,6 +226,7 @@ enum Config {
// Pickups
//#define MONEY_MESSAGES
+#define CAMERA_PICKUP
// Peds
#define ANIMATE_PED_COL_MODEL