zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 16:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of c:\programming\doom-dev\zdoom into Branch_97ff4cc02574e3773ff231b1d74c0fdb25e9440d

Browse source
This commit is contained in:
Christoph Oelckers 2016-08-25 22:02:23 +02:00
commit 4a822a8f50
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/farchive.cpp
View file

@ -1194,6 +1194,7 @@ FArchive &FArchive::ReadObject (DObject* &obj, PClass *wanttype)
const PClass *type; const PClass *type;
BYTE playerNum; BYTE playerNum;
DWORD index; DWORD index;
DObject *newobj;
operator<< (objHead); operator<< (objHead);
@ -1255,11 +1256,11 @@ FArchive &FArchive::ReadObject (DObject* &obj, PClass *wanttype)
case NEW_CLS_OBJ: case NEW_CLS_OBJ:
type = ReadClass (wanttype); type = ReadClass (wanttype);
// Printf ("New class: %s (%u)\n", type->Name, m_File->Tell()); // Printf ("New class: %s (%u)\n", type->Name, m_File->Tell());
obj = type->CreateNew (); newobj = obj = type->CreateNew ();
MapObject (obj); MapObject (obj);
obj->SerializeUserVars (*this); newobj->SerializeUserVars (*this);
obj->Serialize (*this); newobj->Serialize (*this);
obj->CheckIfSerialized (); newobj->CheckIfSerialized ();
break; break;
case NEW_PLYR_OBJ: case NEW_PLYR_OBJ:

2
src/g_level.cpp
View file

@ -1280,7 +1280,7 @@ void G_FinishTravel ()
for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory) for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)
{ {
inv->ChangeStatNum (STAT_DEFAULT); inv->ChangeStatNum (STAT_INVENTORY);
inv->LinkToWorld (); inv->LinkToWorld ();
inv->Travelled (); inv->Travelled ();
} }

2
src/g_shared/a_pickups.cpp
View file

@ -821,6 +821,7 @@ void AInventory::BecomeItem ()
} }
RemoveFromHash (); RemoveFromHash ();
flags &= ~MF_SPECIAL; flags &= ~MF_SPECIAL;
ChangeStatNum(STAT_INVENTORY);
SetState (FindState("Held")); SetState (FindState("Held"));
} }
@ -847,6 +848,7 @@ void AInventory::BecomePickup ()
} }
flags = (GetDefault()->flags | MF_DROPPED) & ~MF_COUNTITEM; flags = (GetDefault()->flags | MF_DROPPED) & ~MF_COUNTITEM;
renderflags &= ~RF_INVISIBLE; renderflags &= ~RF_INVISIBLE;
ChangeStatNum(STAT_DEFAULT);
SetState (SpawnState); SetState (SpawnState);
} }

2
src/statnums.h
View file

@ -53,7 +53,7 @@ enum
STAT_BOSSTARGET, // A boss brain target STAT_BOSSTARGET, // A boss brain target
STAT_LIGHTNING, // The lightning thinker STAT_LIGHTNING, // The lightning thinker
STAT_DECALTHINKER, // An object that thinks for a decal STAT_DECALTHINKER, // An object that thinks for a decal
UNUSED_STAT_INVENTORY, // An inventory item (value kept for savegame compatibility.) STAT_INVENTORY, // An inventory item
STAT_LIGHT, // A sector light effect STAT_LIGHT, // A sector light effect
STAT_LIGHTTRANSFER, // A sector light transfer. These must be ticked after the light effects!!! STAT_LIGHTTRANSFER, // A sector light transfer. These must be ticked after the light effects!!!
STAT_EARTHQUAKE, // Earthquake actors STAT_EARTHQUAKE, // Earthquake actors