zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- print out FriendlySeeBlocks on 'info' ccmd 

- not setting FriendlySeeBlocks on UDMF now causes the actor to use its ZScript default
This commit is contained in:
Rachael Alexanderson 2018-01-09 15:48:19 -05:00
parent 9c189e5d4b
commit ee9736fbb3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p_mobj.cpp
View File

@ -6029,7 +6029,8 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
mobj->SpawnPoint = mthing->pos;
mobj->SpawnAngle = mthing->angle;
mobj->SpawnFlags = mthing->flags;
mobj->friendlyseeblocks = mthing->friendlyseeblocks;
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;
@ -8466,5 +8467,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);
}
}

2
src/p_setup.cpp
View File

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