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

- Fixed: Because P_OpenMapData() now reopens the containing file for the map, P_LoadGLNodes() needs a new check for if the map came from a regular wad.

Browse source 
SVN r4136 (trunk)
This commit is contained in:
Randy Heit 2013-02-14 05:06:05 +00:00
parent 0a2e42c090
commit 7714a45e02
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_glnodes.cpp
View file

@ -901,7 +901,7 @@ bool P_LoadGLNodes(MapData * map)
char path[256]; char path[256];
int li; int li;
int lumpfile = Wads.GetLumpFile(map->lumpnum); int lumpfile = Wads.GetLumpFile(map->lumpnum);
bool mapinwad = map->file == Wads.GetFileReader(lumpfile); bool mapinwad = map->InWad;
FileReader * fr = map->file; FileReader * fr = map->file;
FResourceFile * f_gwa = NULL; FResourceFile * f_gwa = NULL;

1
src/p_setup.cpp
View file

@ -304,6 +304,7 @@ MapData *P_OpenMapData(const char * mapname)
// As such any special handling for other types of lumps is skipped. // As such any special handling for other types of lumps is skipped.
map->MapLumps[0].Reader = map->file = Wads.ReopenLumpNum(lump_name); map->MapLumps[0].Reader = map->file = Wads.ReopenLumpNum(lump_name);
map->Encrypted = Wads.IsEncryptedFile(lump_name); map->Encrypted = Wads.IsEncryptedFile(lump_name);
map->InWad = true;
if (map->Encrypted) if (map->Encrypted)
{ // If it's encrypted, then it's a Blood file, presumably a map. { // If it's encrypted, then it's a Blood file, presumably a map.

2
src/p_setup.h
View file

@ -37,6 +37,7 @@ struct MapData
bool HasBehavior; bool HasBehavior;
bool Encrypted; bool Encrypted;
bool isText; bool isText;
bool InWad;
int lumpnum; int lumpnum;
FileReader * file; FileReader * file;
FResourceFile * resource; FResourceFile * resource;
@ -50,6 +51,7 @@ struct MapData
HasBehavior = false; HasBehavior = false;
Encrypted = false; Encrypted = false;
isText = false; isText = false;
InWad = false;
} }
~MapData() ~MapData()