diff --git a/src/gamedata/gi.cpp b/src/gamedata/gi.cpp index b65fc013d..55922b13e 100644 --- a/src/gamedata/gi.cpp +++ b/src/gamedata/gi.cpp @@ -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 diff --git a/src/gamedata/gi.h b/src/gamedata/gi.h index 589f39eaf..7d9999d48 100644 --- a/src/gamedata/gi.h +++ b/src/gamedata/gi.h @@ -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; diff --git a/src/maploader/maploader.cpp b/src/maploader/maploader.cpp index c761e37a8..e852a5145 100644 --- a/src/maploader/maploader.cpp +++ b/src/maploader/maploader.cpp @@ -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; diff --git a/wadsrc/static/zscript/doombase.zs b/wadsrc/static/zscript/doombase.zs index 836851b4e..1cc6bf4e8 100644 --- a/wadsrc/static/zscript/doombase.zs +++ b/wadsrc/static/zscript/doombase.zs @@ -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;