zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-18 22:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-enabled clearscope for methods; made isBlinking() clearscope

Browse source
This commit is contained in:
ZZYZX 2017-02-18 07:51:29 +02:00
parent ab07b30d5e
commit fb9b8c8870
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/zscript/zcc_compile.cpp
View file

@ -2075,7 +2075,7 @@ void ZCCCompiler::CompileFunction(ZCC_StructWork *c, ZCC_FuncDeclarator *f, bool
} while (t != f->Type); } while (t != f->Type);
} }
int notallowed = ZCC_Latent | ZCC_Meta | ZCC_ReadOnly | ZCC_Abstract | ZCC_ClearScope; int notallowed = ZCC_Latent | ZCC_Meta | ZCC_ReadOnly | ZCC_Abstract;
if (f->Flags & notallowed) if (f->Flags & notallowed)
{ {

2
wadsrc/static/zscript/inventory/powerups.txt
View file

@ -285,7 +285,7 @@ class Powerup : Inventory
// //
//=========================================================================== //===========================================================================
virtual bool isBlinking() virtual clearscope bool isBlinking()
{ {
return (EffectTics <= BLINKTHRESHOLD && (EffectTics & 8) && !bNoScreenBlink); return (EffectTics <= BLINKTHRESHOLD && (EffectTics & 8) && !bNoScreenBlink);
} }