zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 04:51:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Don't transform map variable string initializers into global string table entries if

Browse source 
they don't really exist in the source string table.

SVN r4321 (trunk)
This commit is contained in:
Randy Heit 2013-06-02 23:17:46 +00:00
parent 1b9c71b252
commit 45c1787203
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_acs.cpp
View file

@ -1881,7 +1881,11 @@ FBehavior::FBehavior (int lumpnum, FileReader * fr, int len)
for (DWORD i = 0; i < chunk[1]/4; ++i) for (DWORD i = 0; i < chunk[1]/4; ++i)
{ {
// MapVarStore[chunk[i+2]] |= LibraryID; // MapVarStore[chunk[i+2]] |= LibraryID;
MapVarStore[chunk[i+2]] = GlobalACSStrings.AddString(LookupString(MapVarStore[chunk[i+2]])); const char *str = LookupString(MapVarStore[chunk[i+2]]);
if (str != NULL)
{
MapVarStore[chunk[i+2]] = GlobalACSStrings.AddString(str);
}
} }
} }
@ -1897,7 +1901,11 @@ FBehavior::FBehavior (int lumpnum, FileReader * fr, int len)
for (int j = ArrayStore[arraynum].ArraySize; j > 0; --j, ++elems) for (int j = ArrayStore[arraynum].ArraySize; j > 0; --j, ++elems)
{ {
// *elems |= LibraryID; // *elems |= LibraryID;
*elems = GlobalACSStrings.AddString(LookupString(*elems)); const char *str = LookupString(*elems);
if (str != NULL)
{
*elems = GlobalACSStrings.AddString(str);
}
} }
} }
} }
@ -1927,7 +1935,11 @@ FBehavior::FBehavior (int lumpnum, FileReader * fr, int len)
} }
else if (*chunkData == 1) else if (*chunkData == 1)
{ {
*elems = GlobalACSStrings.AddString(LookupString(*elems)); const char *str = LookupString(*elems);
if (str != NULL)
{
*elems = GlobalACSStrings.AddString(str);
}
} }
} }
i += 4+ArrayStore[arraynum].ArraySize; i += 4+ArrayStore[arraynum].ArraySize;