zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-17 08:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'gzdoom/master'

Browse source
This commit is contained in:
Rachael Alexanderson 2018-01-09 19:27:45 -05:00
commit fde3d65066
5 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/doomdata.h
View file

@ -371,8 +371,9 @@ struct FMapThing
int16_t roll;
uint32_t RenderStyle;
int FloatbobPhase;
double SpotInnerAngle = 10;
double SpotOuterAngle = 25;
double SpotInnerAngle = 10;
double SpotOuterAngle = 25;
int friendlyseeblocks;
};

1
src/namedef.h
View file

@ -504,6 +504,7 @@ xx(ScaleX)
xx(ScaleY)
xx(SpotInnerAngle)
xx(SpotOuterAngle)
xx(FriendlySeeBlocks)
xx(Floatbobphase)
xx(Floatbobstrength)
xx(Target)

3
src/p_mobj.cpp
View file

@ -6032,6 +6032,8 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
mobj->SpawnPoint = mthing->pos;
mobj->SpawnAngle = mthing->angle;
mobj->SpawnFlags = mthing->flags;
if (mthing->friendlyseeblocks > 0)
mobj->friendlyseeblocks = mthing->friendlyseeblocks;
if (mthing->FloatbobPhase >= 0 && mthing->FloatbobPhase < 64) mobj->FloatBobPhase = mthing->FloatbobPhase;
if (mthing->Gravity < 0) mobj->Gravity = -mthing->Gravity;
else if (mthing->Gravity > 0) mobj->Gravity *= mthing->Gravity;
@ -8474,5 +8476,6 @@ void PrintMiscActorInfo(AActor *query)
Printf("\nSpeed= %f, velocity= x:%f, y:%f, z:%f, combined:%f.\n",
query->Speed, query->Vel.X, query->Vel.Y, query->Vel.Z, query->Vel.Length());
Printf("Scale: x:%f, y:%f\n", query->Scale.X, query->Scale.Y);
Printf("FriendlySeeBlocks: %d\n", query->friendlyseeblocks);
}
}

1
src/p_setup.cpp
View file

@ -1831,6 +1831,7 @@ void P_LoadThings2 (MapData * map)
mti[i].Alpha = -1;
mti[i].Health = 1;
mti[i].FloatbobPhase = -1;
mti[i].friendlyseeblocks = -1;
}
delete[] mtp;
}

4
src/p_udmf.cpp
View file

@ -805,6 +805,10 @@ public:
case NAME_SpotOuterAngle:
th->SpotOuterAngle = CheckFloat(key);
case NAME_FriendlySeeBlocks:
CHECK_N(Zd | Zdt)
th->friendlyseeblocks = CheckInt(key);
break;
default: