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

- Fixed: UnescapeStringTable() used the wrong position in the script file for Hexen-style ACS.

Browse source 
SVN r3424 (trunk)
This commit is contained in:
Randy Heit 2012-03-11 03:47:45 +00:00
parent 58ed367280
commit 51e66acc6b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_acs.cpp
View file

@ -1178,7 +1178,7 @@ FBehavior::FBehavior (int lumpnum, FileReader * fr, int len)
if (strings != NULL) if (strings != NULL)
{ {
StringTable = DWORD(strings - Data + 8); StringTable = DWORD(strings - Data + 8);
UnescapeStringTable(strings, true); UnescapeStringTable(strings + 8, true);
} }
else else
{ {
@ -1621,7 +1621,7 @@ void FBehavior::LoadScriptsDirectory ()
scripts.b = FindChunk(MAKE_ID('S','N','A','M')); scripts.b = FindChunk(MAKE_ID('S','N','A','M'));
if (scripts.dw != NULL) if (scripts.dw != NULL)
{ {
UnescapeStringTable(scripts.b, false); UnescapeStringTable(scripts.b + 8, false);
for (i = 0; i < NumScripts; ++i) for (i = 0; i < NumScripts; ++i)
{ {
// ACC stores script names as an index into the SNAM chunk, with the first index as // ACC stores script names as an index into the SNAM chunk, with the first index as
@ -1696,7 +1696,6 @@ void FBehavior::UnescapeStringTable(BYTE *chunkstart, bool has_padding)
assert(chunkstart != NULL); assert(chunkstart != NULL);
DWORD *chunk = (DWORD *)chunkstart; DWORD *chunk = (DWORD *)chunkstart;
chunk += 2;
if (!has_padding) if (!has_padding)
{ {