zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 06:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use FName instead of FString to store arg0str in FMapThing.

Browse source 
This is because FMapThing gets memset to 0 and changing that would cause more work than it is worth to keep the string. The only thing it is used for is the color for dynamic lights and those do not need case sensitivity so a name will just do as well, but require less adjustments elsewhere.
This commit is contained in:
Christoph Oelckers 2018-01-21 09:10:04 +01:00
parent c93d025088
commit 56e2db38fd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomdata.h
View file

@ -372,7 +372,7 @@ struct FMapThing
uint32_t RenderStyle; uint32_t RenderStyle;
int FloatbobPhase; int FloatbobPhase;
int friendlyseeblocks; int friendlyseeblocks;
FString arg0str; FNameNoInit arg0str;
}; };

2
src/p_mobj.cpp
View file

@ -6098,7 +6098,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
if (i->IsDescendantOf(RUNTIME_CLASS(ADynamicLight))) if (i->IsDescendantOf(RUNTIME_CLASS(ADynamicLight)))
{ {
auto light = static_cast<ADynamicLight*>(mobj); auto light = static_cast<ADynamicLight*>(mobj);
if (mthing->arg0str.IsNotEmpty()) if (mthing->arg0str != NAME_None)
{ {
PalEntry color = V_GetColor(nullptr, mthing->arg0str); PalEntry color = V_GetColor(nullptr, mthing->arg0str);
} }