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

Merge branch 'master' into scripting

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-29 10:53:37 +02:00
commit 1effaa4c8e
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_setup.cpp
View file

@ -1830,6 +1830,11 @@ void P_LoadThings2 (MapData * map)
mti[i].SkillFilter = MakeSkill(mti[i].flags); mti[i].SkillFilter = MakeSkill(mti[i].flags);
mti[i].ClassFilter = (mti[i].flags & MTF_CLASS_MASK) >> MTF_CLASS_SHIFT; mti[i].ClassFilter = (mti[i].flags & MTF_CLASS_MASK) >> MTF_CLASS_SHIFT;
mti[i].flags &= ~(MTF_SKILLMASK|MTF_CLASS_MASK); mti[i].flags &= ~(MTF_SKILLMASK|MTF_CLASS_MASK);
if (level.flags2 & LEVEL2_HEXENHACK)
{
mti[i].flags &= 0x7ff; // mask out Strife flags if playing an original Hexen map.
}
mti[i].gravity = FRACUNIT; mti[i].gravity = FRACUNIT;
mti[i].RenderStyle = STYLE_Count; mti[i].RenderStyle = STYLE_Count;
mti[i].alpha = -1; mti[i].alpha = -1;

4
src/p_tags.cpp
View file

@ -314,7 +314,7 @@ int FSectorTagIterator::Next()
while (start >= 0 && tagManager.allTags[start].tag != searchtag) start = tagManager.allTags[start].nexttag; while (start >= 0 && tagManager.allTags[start].tag != searchtag) start = tagManager.allTags[start].nexttag;
if (start == -1) return -1; if (start == -1) return -1;
ret = tagManager.allTags[start].target; ret = tagManager.allTags[start].target;
start = start = tagManager.allTags[start].nexttag; start = tagManager.allTags[start].nexttag;
} }
return ret; return ret;
} }
@ -348,6 +348,6 @@ int FLineIdIterator::Next()
while (start >= 0 && tagManager.allIDs[start].tag != searchtag) start = tagManager.allIDs[start].nexttag; while (start >= 0 && tagManager.allIDs[start].tag != searchtag) start = tagManager.allIDs[start].nexttag;
if (start == -1) return -1; if (start == -1) return -1;
int ret = tagManager.allIDs[start].target; int ret = tagManager.allIDs[start].target;
start = start = tagManager.allIDs[start].nexttag; start = tagManager.allIDs[start].nexttag;
return ret; return ret;
} }

2
src/sound/fmodsound.cpp
View file

@ -304,7 +304,7 @@ class FMODStreamCapsule : public SoundStream
public: public:
FMODStreamCapsule(FMOD::Sound *stream, FMODSoundRenderer *owner, const char *url) FMODStreamCapsule(FMOD::Sound *stream, FMODSoundRenderer *owner, const char *url)
: Owner(owner), Stream(NULL), Channel(NULL), : Owner(owner), Stream(NULL), Channel(NULL),
UserData(NULL), Callback(NULL), URL(url), Reader(NULL), Ended(false) UserData(NULL), Callback(NULL), Reader(NULL), URL(url), Ended(false)
{ {
SetStream(stream); SetStream(stream);
} }