qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-21 11:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix wad loading when loading the map.

Browse source 
This broke with the fix for the entity inspector.
This commit is contained in:
Bill Currie 2010-10-04 19:44:37 +09:00
parent 05a8b981a5
commit 3593274eeb
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/Forge/Bundles/MapEdit/Map.m
View file

@ -264,17 +264,18 @@ readMapFile
[self addSelected];
ent = [self objectAtIndex: 0];
// load the apropriate texture wad
wad = [currentEntity valueForQKey: "wad"];
wad = [ent valueForQKey: "wad"];
if (wad && wad[0]) {
// remove old style fullpaths
if (wad[0] == '/')
[currentEntity removeKeyPair: "wad"];
[ent removeKeyPair: "wad"];
else if (strcmp ([texturepalette_i currentWad], wad))
[project_i setTextureWad: wad];
}
[self setCurrentEntity: [self objectAtIndex: 0]];
[self setCurrentEntity: ent];
// center the camera and XY view on the playerstart
c = [self count];