OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	src/r_bsp.cpp
#	src/r_main.cpp
#	src/r_segs.cpp
#	src/r_things.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
This commit is contained in:
Rachael Alexanderson 2017-01-28 17:39:55 -05:00
commit 0c101102dc
41 changed files with 187 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/g_level.cpp
View file

@ -101,7 +101,6 @@ EXTERN_CVAR (Float, sv_gravity)
EXTERN_CVAR (Float, sv_aircontrol)
EXTERN_CVAR (Int, disableautosave)
EXTERN_CVAR (String, playerclass)
EXTERN_CVAR(Int, r_preservesectorcolor)
#define SNAP_ID MAKE_ID('s','n','A','p')
#define DSNP_ID MAKE_ID('d','s','N','p')
@ -1489,20 +1488,6 @@ bool FLevelLocals::IsFreelookAllowed() const
//
//==========================================================================
bool FLevelLocals::PreserveSectorColor() const
{
if (r_preservesectorcolor == 0)
return false;
if (r_preservesectorcolor == 1)
return true;
return !!(level.flags3 & LEVEL3_PRESERVESECTORCOLOR);
}
//==========================================================================
//
//
//==========================================================================
FString CalcMapName (int episode, int level)
{
FString lumpname;