summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-23 23:45:45 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-23 23:45:45 +0200
commitbd67db523aa4e711e60a16abbf738b8b4462d572 (patch)
tree4df6ecc0b4051228d93e922fbc6e00771778041d /src/core
parentmore checks in premake (diff)
parentEven more small audio cleanup (diff)
downloadre3-bd67db523aa4e711e60a16abbf738b8b4462d572.tar
re3-bd67db523aa4e711e60a16abbf738b8b4462d572.tar.gz
re3-bd67db523aa4e711e60a16abbf738b8b4462d572.tar.bz2
re3-bd67db523aa4e711e60a16abbf738b8b4462d572.tar.lz
re3-bd67db523aa4e711e60a16abbf738b8b4462d572.tar.xz
re3-bd67db523aa4e711e60a16abbf738b8b4462d572.tar.zst
re3-bd67db523aa4e711e60a16abbf738b8b4462d572.zip
Diffstat (limited to '')
-rw-r--r--src/core/config.h5
-rw-r--r--src/core/main.cpp8
2 files changed, 4 insertions, 9 deletions
diff --git a/src/core/config.h b/src/core/config.h
index 40882128..f43067d7 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -196,11 +196,6 @@ enum Config {
#define USE_TXD_CDIMAGE // generate and load textures from txd.img
#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number
//#define USE_TEXTURE_POOL
-#ifdef _WIN32
-#define AUDIO_MSS
-#else
-#define AUDIO_OAL
-#endif
// Particle
//#define PC_PARTICLE
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 1ea8dc7f..acdf6f4e 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -328,7 +328,7 @@ PluginAttach(void)
static RwBool
Initialise3D(void *param)
{
- if (RsRwInitialise(param))
+ if (RsRwInitialize(param))
{
#ifdef DEBUGMENU
DebugMenuInit();
@@ -1146,10 +1146,10 @@ AppEventHandler(RsEvent event, void *param)
{
switch( event )
{
- case rsINITIALISE:
+ case rsINITIALIZE:
{
CGame::InitialiseOnceBeforeRW();
- return RsInitialise() ? rsEVENTPROCESSED : rsEVENTERROR;
+ return RsInitialize() ? rsEVENTPROCESSED : rsEVENTERROR;
}
case rsCAMERASIZE:
@@ -1161,7 +1161,7 @@ AppEventHandler(RsEvent event, void *param)
return rsEVENTPROCESSED;
}
- case rsRWINITIALISE:
+ case rsRWINITIALIZE:
{
return Initialise3D(param) ? rsEVENTPROCESSED : rsEVENTERROR;
}