mirror of
https://github.com/ZDoom/Raze.git
synced 2025-06-02 02:01:31 +00:00
- fixed compilation.
Much of this commit will have to be undone later, once the texture manager becomes available.
This commit is contained in:
parent
c0217c9152
commit
daf77e55f7
9 changed files with 22 additions and 4 deletions
|
@ -1062,6 +1062,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, float &value, float *d
|
|||
|
||||
FSerializer &Serialize(FSerializer &arc, const char *key, FTextureID &value, FTextureID *defval)
|
||||
{
|
||||
#if 0
|
||||
if (arc.isWriting())
|
||||
{
|
||||
if (!arc.w->inObject() || defval == nullptr || value != *defval)
|
||||
|
@ -1138,6 +1139,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, FTextureID &value, FTe
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return arc;
|
||||
}
|
||||
|
||||
|
@ -1503,7 +1505,7 @@ template<> FSerializer &Serialize(FSerializer &arc, const char *key, Dictionary
|
|||
{
|
||||
if (arc.isWriting())
|
||||
{
|
||||
FString contents { dict ? DictionaryToString(*dict) : "null" };
|
||||
FString contents { dict ? DictionaryToString(*dict) : FString("null") };
|
||||
return arc(key, contents);
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue