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

Merge branch 'master' of https://github.com/coelckers/gzdoom into texture_rework

Browse source
This commit is contained in:
Rachael Alexanderson 2020-05-18 23:13:37 -04:00
commit 58b3cb0971
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/scripting/core/dictionary.cpp
View file

@ -43,7 +43,7 @@ void Dictionary::Serialize(FSerializer &arc)
Dictionary *pointerToDeserializedDictionary;
arc(key, pointerToDeserializedDictionary);
Map.TransferFrom(pointerToDeserializedDictionary->Map);
delete pointerToDeserializedDictionary;
pointerToDeserializedDictionary->Destroy();
}
}

2
src/maploader/polyobjects.cpp
View file

@ -331,7 +331,7 @@ void MapLoader::PO_Init (void)
TArray<FMapThing *> polythings;
for (auto &mthing : MapThingsConverted)
{
if (mthing.EdNum == 0 || mthing.EdNum == -1 || mthing.info == nullptr) continue;
if (mthing.EdNum == 0 || mthing.EdNum == -1 || mthing.info == nullptr || mthing.info->Type != nullptr) continue;
FDoomEdEntry *mentry = mthing.info;
switch (mentry->Special)

6
wadsrc/static/zscript/actors/inventory/powerups.zs
View file

@ -356,7 +356,11 @@ class PowerInvulnerable : Powerup
{
return;
}
Owner.bInvulnerable = true;
if (Mode == 'Reflective')
{
Owner.bReflective = true;
}
if (Mode == 'Ghost')
{
if (!Owner.bShadow)

4
wadsrc/static/zscript/actors/shared/camera.zs
View file

@ -63,14 +63,14 @@ class AimingCamera : SecurityCamera
args[2] = 0;
Super.PostBeginPlay ();
MaxPitchChange = double(changepitch / TICRATE);
MaxPitchChange = double(changepitch) / TICRATE;
Range /= TICRATE;
ActorIterator it = Level.CreateActorIterator(args[3]);
tracer = it.Next ();
if (tracer == NULL)
{
//Printf ("AimingCamera %d: Can't find TID %d\n", tid, args[3]);
console.Printf ("AimingCamera %d: Can't find TID %d\n", tid, args[3]);
}
else
{ // Don't try for a new target upon losing this one.