OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Rename forceLightmaps to forceEnableLightmaps

Browse source
This commit is contained in:
RaveYard 2024-05-22 12:07:42 +02:00
commit 33c705863c
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gamedata/gi.cpp
View file

@ -77,7 +77,7 @@ DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, defaultdropstyle)
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, normforwardmove)
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, normsidemove)
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, mHideParTimes)
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, forceLightmaps)
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, forceEnableLightmaps)
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, defaultSunColor)
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, defaultSunDirection)
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, defaultLightmapSampleDistance)
@ -477,7 +477,7 @@ void FMapInfoParser::ParseGameInfo()
GAMEINFOKEY_TWODOUBLES(normsidemove, "normsidemove")
GAMEINFOKEY_BOOL(nomergepickupmsg, "nomergepickupmsg")
GAMEINFOKEY_BOOL(mHideParTimes, "hidepartimes")
GAMEINFOKEY_BOOL(forceLightmaps, "forcelightmaps")
GAMEINFOKEY_BOOL(forceEnableLightmaps, "forceenablelightmaps")
GAMEINFOKEY_THREEDOUBLES(defaultSunColor, "defaultsuncolor")
GAMEINFOKEY_THREEDOUBLES(defaultSunDirection, "defaultSunDirection")
else

2
src/gamedata/gi.h
View file

@ -215,7 +215,7 @@ struct gameinfo_t
bool nomergepickupmsg;
bool mHideParTimes;
CutsceneDef IntroScene;
bool forceLightmaps = false;
bool forceEnableLightmaps = false;
FVector3 defaultSunColor = FVector3(1.f, 1.f, 1.f);
FVector3 defaultSunDirection = FVector3(0.45f, 0.3f, 0.9f);
int defaultLightmapSampleDistance = 16;

2
src/maploader/maploader.cpp
View file

@ -3208,7 +3208,7 @@ void MapLoader::LoadLevel(MapData *map, const char *lumpname, int position)
Level->SunColor = gameinfo.defaultSunColor;
Level->SunDirection = gameinfo.defaultSunDirection;
Level->LightmapSampleDistance = gameinfo.defaultLightmapSampleDistance;
Level->lightmaps = gameinfo.forceLightmaps;
Level->lightmaps = gameinfo.forceEnableLightmaps;
// note: most of this ordering is important
ForceNodeBuild = gennodes;

2
wadsrc/static/zscript/doombase.zs
View file

@ -107,7 +107,7 @@ extend struct GameInfoStruct
native double normforwardmove[2];
native double normsidemove[2];
native bool mHideParTimes;
native bool forceLightmaps;
native bool forceEnableLightmaps;
native FVector3 defaultSunColor;
native FVector3 defaultSunDirection;
native int defaultLightmapSampleDistance;