zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-01 00:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Improve the TFlags code and fix the new errors.

Browse source 
The previous version didn't detect some real mistakes in code which used operator& with the wrong flagset (for now 'converted' to the correcly equivalent counterpart, waiting for the proper fix).
This commit is contained in:
Edoardo Prezioso 2015-10-13 00:30:06 +02:00
parent 72445667e3
commit 6678c3550e
11 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/d_dehacked.cpp
View file

@ -784,7 +784,7 @@ static int PatchThing (int thingy)
bool hadStyle = false; bool hadStyle = false;
FStateDefinitions statedef; FStateDefinitions statedef;
bool patchedStates = false; bool patchedStates = false;
int oldflags; ActorFlags oldflags;
const PClass *type; const PClass *type;
SWORD *ednum, dummyed; SWORD *ednum, dummyed;
@ -1139,28 +1139,28 @@ static int PatchThing (int thingy)
} }
if (vchanged[1]) if (vchanged[1])
{ {
info->flags2 = ActorFlags2::FromInt (value[1]); if (value[1] & 0x00000004) // old BOUNCE1
if (info->flags2 & 0x00000004) // old BOUNCE1
{ {
info->flags2 &= ActorFlags2::FromInt (~4); value[1] &= ~0x00000004;
info->BounceFlags = BOUNCE_DoomCompat; info->BounceFlags = BOUNCE_DoomCompat;
} }
// Damage types that once were flags but now are not // Damage types that once were flags but now are not
if (info->flags2 & 0x20000000) if (value[1] & 0x20000000)
{ {
info->DamageType = NAME_Ice; info->DamageType = NAME_Ice;
info->flags2 &= ActorFlags2::FromInt (~0x20000000); value[1] &= ~0x20000000;
} }
if (info->flags2 & 0x10000) if (value[1] & 0x10000000)
{ {
info->DamageType = NAME_Fire; info->DamageType = NAME_Fire;
info->flags2 &= ActorFlags2::FromInt (~0x10000); value[1] &= ~0x10000000;
} }
if (info->flags2 & 1) if (value[1] & 0x00000001)
{ {
info->gravity = FRACUNIT/4; info->gravity = FRACUNIT/4;
info->flags2 &= ActorFlags2::FromInt (~1); value[1] &= ~0x00000001;
} }
info->flags2 = ActorFlags2::FromInt (value[1]);
} }
if (vchanged[2]) if (vchanged[2])
{ {

2
src/fragglescript/t_func.cpp
View file

@ -1236,7 +1236,7 @@ void FParser::SF_ObjFlag(void)
t_return.type = svt_int; t_return.type = svt_int;
if (mo && flagnum<26) if (mo && flagnum<26)
{ {
t_return.value.i = !!(mo->flags & (1 << flagnum)); t_return.value.i = !!(mo->flags & ActorFlags::FromInt(1 << flagnum));
} }
else t_return.value.i = 0; else t_return.value.i = 0;
} }

2
src/g_hexen/a_clericstaff.cpp
View file

@ -75,7 +75,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_CStaffCheck)
{ {
pmo->angle = R_PointToAngle2 (pmo->x, pmo->y, linetarget->x, linetarget->y); pmo->angle = R_PointToAngle2 (pmo->x, pmo->y, linetarget->x, linetarget->y);
if (((linetarget->player && (!linetarget->IsTeammate (pmo) || level.teamdamage != 0))|| linetarget->flags3&MF3_ISMONSTER) if (((linetarget->player && (!linetarget->IsTeammate (pmo) || level.teamdamage != 0))|| linetarget->flags3&MF3_ISMONSTER)
&& (!(linetarget->flags2&(MF2_DORMANT+MF2_INVULNERABLE)))) && (!(linetarget->flags2&(MF2_DORMANT|MF2_INVULNERABLE))))
{ {
newLife = player->health+(damage>>3); newLife = player->health+(damage>>3);
newLife = newLife > max ? max : newLife; newLife = newLife > max ? max : newLife;

4
src/p_acs.cpp
View file

@ -5761,9 +5761,9 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
return 0; return 0;
} }
DWORD actorMask = MF_SHOOTABLE; ActorFlags actorMask = MF_SHOOTABLE;
if (argCount >= 6) { if (argCount >= 6) {
actorMask = args[5]; actorMask = ActorFlags::FromInt(args[5]);
} }
DWORD wallMask = ML_BLOCKEVERYTHING | ML_BLOCKHITSCAN; DWORD wallMask = ML_BLOCKEVERYTHING | ML_BLOCKHITSCAN;

2
src/p_local.h
View file

@ -500,7 +500,7 @@ enum // P_LineAttack flags
AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance, int pitch, int damage, FName damageType, const PClass *pufftype, int flags = 0, AActor **victim = NULL, int *actualdamage = NULL); AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance, int pitch, int damage, FName damageType, const PClass *pufftype, int flags = 0, AActor **victim = NULL, int *actualdamage = NULL);
AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance, int pitch, int damage, FName damageType, FName pufftype, int flags = 0, AActor **victim = NULL, int *actualdamage = NULL); AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance, int pitch, int damage, FName damageType, FName pufftype, int flags = 0, AActor **victim = NULL, int *actualdamage = NULL);
AActor *P_LinePickActor (AActor *t1, angle_t angle, fixed_t distance, int pitch, DWORD actorMask, DWORD wallMask); AActor *P_LinePickActor (AActor *t1, angle_t angle, fixed_t distance, int pitch, ActorFlags actorMask, DWORD wallMask);
void P_TraceBleed (int damage, fixed_t x, fixed_t y, fixed_t z, AActor *target, angle_t angle, int pitch); void P_TraceBleed (int damage, fixed_t x, fixed_t y, fixed_t z, AActor *target, angle_t angle, int pitch);
void P_TraceBleed (int damage, AActor *target, angle_t angle, int pitch); void P_TraceBleed (int damage, AActor *target, angle_t angle, int pitch);
void P_TraceBleed (int damage, AActor *target, AActor *missile); // missile version void P_TraceBleed (int damage, AActor *target, AActor *missile); // missile version

2
src/p_map.cpp
View file

@ -3912,7 +3912,7 @@ AActor *P_LineAttack(AActor *t1, angle_t angle, fixed_t distance,
//========================================================================== //==========================================================================
AActor *P_LinePickActor(AActor *t1, angle_t angle, fixed_t distance, int pitch, AActor *P_LinePickActor(AActor *t1, angle_t angle, fixed_t distance, int pitch,
DWORD actorMask, DWORD wallMask) ActorFlags actorMask, DWORD wallMask)
{ {
fixed_t vx, vy, vz, shootz; fixed_t vx, vy, vz, shootz;

14
src/p_mobj.cpp
View file

@ -6467,25 +6467,25 @@ void PrintMiscActorInfo(AActor *query)
Printf("%s @ %p has the following flags:\n flags: %x", query->GetTag(), query, query->flags.GetValue()); Printf("%s @ %p has the following flags:\n flags: %x", query->GetTag(), query, query->flags.GetValue());
for (flagi = 0; flagi <= 31; flagi++) for (flagi = 0; flagi <= 31; flagi++)
if (query->flags & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags)); if (query->flags & ActorFlags::FromInt(1<<flagi)) Printf(" %s", FLAG_NAME(1<<flagi, flags));
Printf("\n flags2: %x", query->flags2.GetValue()); Printf("\n flags2: %x", query->flags2.GetValue());
for (flagi = 0; flagi <= 31; flagi++) for (flagi = 0; flagi <= 31; flagi++)
if (query->flags2 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags2)); if (query->flags2 & ActorFlags2::FromInt(1<<flagi)) Printf(" %s", FLAG_NAME(1<<flagi, flags2));
Printf("\n flags3: %x", query->flags3.GetValue()); Printf("\n flags3: %x", query->flags3.GetValue());
for (flagi = 0; flagi <= 31; flagi++) for (flagi = 0; flagi <= 31; flagi++)
if (query->flags3 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags3)); if (query->flags3 & ActorFlags3::FromInt(1<<flagi)) Printf(" %s", FLAG_NAME(1<<flagi, flags3));
Printf("\n flags4: %x", query->flags4.GetValue()); Printf("\n flags4: %x", query->flags4.GetValue());
for (flagi = 0; flagi <= 31; flagi++) for (flagi = 0; flagi <= 31; flagi++)
if (query->flags4 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags4)); if (query->flags4 & ActorFlags4::FromInt(1<<flagi)) Printf(" %s", FLAG_NAME(1<<flagi, flags4));
Printf("\n flags5: %x", query->flags5.GetValue()); Printf("\n flags5: %x", query->flags5.GetValue());
for (flagi = 0; flagi <= 31; flagi++) for (flagi = 0; flagi <= 31; flagi++)
if (query->flags5 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags5)); if (query->flags5 & ActorFlags5::FromInt(1<<flagi)) Printf(" %s", FLAG_NAME(1<<flagi, flags5));
Printf("\n flags6: %x", query->flags6.GetValue()); Printf("\n flags6: %x", query->flags6.GetValue());
for (flagi = 0; flagi <= 31; flagi++) for (flagi = 0; flagi <= 31; flagi++)
if (query->flags6 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags6)); if (query->flags6 & ActorFlags6::FromInt(1<<flagi)) Printf(" %s", FLAG_NAME(1<<flagi, flags6));
Printf("\n flags7: %x", query->flags7.GetValue()); Printf("\n flags7: %x", query->flags7.GetValue());
for (flagi = 0; flagi <= 31; flagi++) for (flagi = 0; flagi <= 31; flagi++)
if (query->flags7 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags7)); if (query->flags7 & ActorFlags7::FromInt(1<<flagi)) Printf(" %s", FLAG_NAME(1<<flagi, flags7));
Printf("\nBounce flags: %x\nBounce factors: f:%f, w:%f", Printf("\nBounce flags: %x\nBounce factors: f:%f, w:%f",
query->BounceFlags.GetValue(), FIXED2FLOAT(query->bouncefactor), query->BounceFlags.GetValue(), FIXED2FLOAT(query->bouncefactor),
FIXED2FLOAT(query->wallbouncefactor)); FIXED2FLOAT(query->wallbouncefactor));

5
src/p_trace.cpp
View file

@ -42,7 +42,8 @@ struct FTraceInfo
{ {
fixed_t StartX, StartY, StartZ; fixed_t StartX, StartY, StartZ;
fixed_t Vx, Vy, Vz; fixed_t Vx, Vy, Vz;
DWORD ActorMask, WallMask; ActorFlags ActorMask;
DWORD WallMask;
AActor *IgnoreThis; AActor *IgnoreThis;
FTraceResults *Results; FTraceResults *Results;
sector_t *CurSector; sector_t *CurSector;
@ -70,7 +71,7 @@ static bool EditTraceResult (DWORD flags, FTraceResults &res);
bool Trace (fixed_t x, fixed_t y, fixed_t z, sector_t *sector, bool Trace (fixed_t x, fixed_t y, fixed_t z, sector_t *sector,
fixed_t vx, fixed_t vy, fixed_t vz, fixed_t maxDist, fixed_t vx, fixed_t vy, fixed_t vz, fixed_t maxDist,
DWORD actorMask, DWORD wallMask, AActor *ignore, ActorFlags actorMask, DWORD wallMask, AActor *ignore,
FTraceResults &res, FTraceResults &res,
DWORD flags, ETraceStatus (*callback)(FTraceResults &res, void *), void *callbackdata) DWORD flags, ETraceStatus (*callback)(FTraceResults &res, void *), void *callbackdata)
{ {

3
src/p_trace.h
View file

@ -35,6 +35,7 @@
#define __P_TRACE_H__ #define __P_TRACE_H__
#include <stddef.h> #include <stddef.h>
#include "actor.h"
#include "textures/textures.h" #include "textures/textures.h"
struct sector_t; struct sector_t;
@ -96,7 +97,7 @@ enum ETraceStatus
bool Trace (fixed_t x, fixed_t y, fixed_t z, sector_t *sector, bool Trace (fixed_t x, fixed_t y, fixed_t z, sector_t *sector,
fixed_t vx, fixed_t vy, fixed_t vz, fixed_t maxDist, fixed_t vx, fixed_t vy, fixed_t vz, fixed_t maxDist,
DWORD ActorMask, DWORD WallMask, AActor *ignore, ActorFlags ActorMask, DWORD WallMask, AActor *ignore,
FTraceResults &res, FTraceResults &res,
DWORD traceFlags=0, DWORD traceFlags=0,
ETraceStatus (*callback)(FTraceResults &res, void *)=NULL, void *callbackdata=NULL); ETraceStatus (*callback)(FTraceResults &res, void *)=NULL, void *callbackdata=NULL);

4
src/tflags.h
View file

@ -94,6 +94,10 @@ public:
static Self FromInt (TT value) { return Self (static_cast<T> (value)); } static Self FromInt (TT value) { return Self (static_cast<T> (value)); }
private: private:
template<typename X> Self operator| (X value) const { return Self::FromInt (Value | value); }
template<typename X> Self operator& (X value) const { return Self::FromInt (Value & value); }
template<typename X> Self operator^ (X value) const { return Self::FromInt (Value ^ value); }
TT Value; TT Value;
}; };

4
src/thingdef/thingdef_codeptr.cpp
View file

@ -1014,7 +1014,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CustomMissile)
targ=owner; targ=owner;
missile->target=owner; missile->target=owner;
// automatic handling of seeker missiles // automatic handling of seeker missiles
if (self->flags & missile->flags2 & MF2_SEEKERMISSILE) if ((self->flags & MF_STEALTH) && (missile->flags2 & MF2_SEEKERMISSILE))
{ {
missile->tracer=self->tracer; missile->tracer=self->tracer;
} }
@ -3414,7 +3414,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckLOF)
lof_data.Flags = flags; lof_data.Flags = flags;
lof_data.BadActor = false; lof_data.BadActor = false;
Trace(x1, y1, z1, sec, vx, vy, vz, range, 0xFFFFFFFF, ML_BLOCKEVERYTHING, self, trace, 0, Trace(x1, y1, z1, sec, vx, vy, vz, range, ActorFlags::FromInt(0xFFFFFFFF), ML_BLOCKEVERYTHING, self, trace, 0,
CheckLOFTraceFunc, &lof_data); CheckLOFTraceFunc, &lof_data);
if (trace.HitType == TRACE_HitActor || if (trace.HitType == TRACE_HitActor ||