Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse Source 
# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h
This commit is contained in:
Sergeanur
2020-05-23 21:14:16 +03:00
parent 5276abb0fb 100e59886d
commit 88b6168f1c
14 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/config.h
View File

@@ -199,11 +199,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
#ifdef DEBUGMENU
#define RELOADABLES // some debug menu options to reload TXD files
#endif