diff --git a/src/actor.h b/src/actor.h index fcfeb4fce..50cd2704c 100644 --- a/src/actor.h +++ b/src/actor.h @@ -583,7 +583,7 @@ public: void Destroy (); ~AActor (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Serialize(FSerializer &arc); void PostSerialize(); diff --git a/src/b_bot.cpp b/src/b_bot.cpp index a4160b92c..a18aa14af 100644 --- a/src/b_bot.cpp +++ b/src/b_bot.cpp @@ -55,7 +55,7 @@ void DBot::Clear () old = { 0, 0 }; } -void DBot::Serialize (FArchive &arc) +void DBot::Serialize(FArchive &arc) { Super::Serialize (arc); diff --git a/src/b_bot.h b/src/b_bot.h index f9085d6fb..e7a6c730e 100644 --- a/src/b_bot.h +++ b/src/b_bot.h @@ -142,7 +142,7 @@ public: DBot (); void Clear (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); //(b_think.cpp) diff --git a/src/c_dispatch.cpp b/src/c_dispatch.cpp index 811052e1c..a751b686f 100644 --- a/src/c_dispatch.cpp +++ b/src/c_dispatch.cpp @@ -65,7 +65,7 @@ class DWaitingCommand : public DThinker public: DWaitingCommand (const char *cmd, int tics); ~DWaitingCommand (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); private: @@ -189,7 +189,7 @@ static const char *KeyConfCommands[] = IMPLEMENT_CLASS (DWaitingCommand) -void DWaitingCommand::Serialize (FArchive &arc) +void DWaitingCommand::Serialize(FArchive &arc) { Super::Serialize (arc); arc << Command << TicsLeft; diff --git a/src/d_player.h b/src/d_player.h index e932223aa..deec3f61d 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -102,7 +102,7 @@ class APlayerPawn : public AActor DECLARE_CLASS_WITH_META(APlayerPawn, AActor, PClassPlayerPawn) HAS_OBJECT_POINTERS public: - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual void PostBeginPlay(); virtual void Tick(); @@ -383,7 +383,7 @@ public: ~player_t(); player_t &operator= (const player_t &p); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); size_t FixPointers (const DObject *obj, DObject *replacement); size_t PropagateMark(); diff --git a/src/decallib.cpp b/src/decallib.cpp index fe8de4d0a..c2bd0f4f3 100644 --- a/src/decallib.cpp +++ b/src/decallib.cpp @@ -113,7 +113,7 @@ struct DDecalThinker : public DThinker HAS_OBJECT_POINTERS public: DDecalThinker (DBaseDecal *decal) : DThinker (STAT_DECALTHINKER), TheDecal (decal) {} - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); TObjPtr TheDecal; protected: DDecalThinker () : DThinker (STAT_DECALTHINKER) {} @@ -123,7 +123,7 @@ IMPLEMENT_POINTY_CLASS (DDecalThinker) DECLARE_POINTER (TheDecal) END_POINTERS -void DDecalThinker::Serialize (FArchive &arc) +void DDecalThinker::Serialize(FArchive &arc) { Super::Serialize (arc); arc << TheDecal; @@ -143,7 +143,7 @@ class DDecalFader : public DDecalThinker DECLARE_CLASS (DDecalFader, DDecalThinker) public: DDecalFader (DBaseDecal *decal) : DDecalThinker (decal) {} - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); int TimeToStartDecay; @@ -168,7 +168,7 @@ class DDecalColorer : public DDecalThinker DECLARE_CLASS (DDecalColorer, DDecalThinker) public: DDecalColorer (DBaseDecal *decal) : DDecalThinker (decal) {} - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); int TimeToStartDecay; @@ -194,7 +194,7 @@ class DDecalStretcher : public DDecalThinker DECLARE_CLASS (DDecalStretcher, DDecalThinker) public: DDecalStretcher (DBaseDecal *decal) : DDecalThinker (decal) {} - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); int TimeToStart; @@ -225,7 +225,7 @@ class DDecalSlider : public DDecalThinker DECLARE_CLASS (DDecalSlider, DDecalThinker) public: DDecalSlider (DBaseDecal *decal) : DDecalThinker (decal) {} - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); int TimeToStart; @@ -1153,7 +1153,7 @@ FDecalAnimator::~FDecalAnimator () IMPLEMENT_CLASS (DDecalFader) -void DDecalFader::Serialize (FArchive &arc) +void DDecalFader::Serialize(FArchive &arc) { Super::Serialize (arc); arc << TimeToStartDecay << TimeToEndDecay << StartTrans; @@ -1200,7 +1200,7 @@ DThinker *FDecalFaderAnim::CreateThinker (DBaseDecal *actor, side_t *wall) const IMPLEMENT_CLASS (DDecalStretcher) -void DDecalStretcher::Serialize (FArchive &arc) +void DDecalStretcher::Serialize(FArchive &arc) { Super::Serialize (arc); arc << TimeToStart @@ -1288,7 +1288,7 @@ void DDecalStretcher::Tick () IMPLEMENT_CLASS (DDecalSlider) -void DDecalSlider::Serialize (FArchive &arc) +void DDecalSlider::Serialize(FArchive &arc) { Super::Serialize (arc); arc << TimeToStart @@ -1371,7 +1371,7 @@ FDecalAnimator *FDecalLib::FindAnimator (const char *name) IMPLEMENT_CLASS (DDecalColorer) -void DDecalColorer::Serialize (FArchive &arc) +void DDecalColorer::Serialize(FArchive &arc) { Super::Serialize (arc); arc << TimeToStartDecay << TimeToEndDecay << StartColor << GoalColor; diff --git a/src/dobject.h b/src/dobject.h index 7f177c8d4..d42228172 100644 --- a/src/dobject.h +++ b/src/dobject.h @@ -467,7 +467,7 @@ public: inline bool IsA (const PClass *type) const; void SerializeUserVars(FArchive &arc); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); void SerializeUserVars(FSerializer &arc); virtual void Serialize(FSerializer &arc); diff --git a/src/dsectoreffect.cpp b/src/dsectoreffect.cpp index d33eeb061..ed8eb3327 100644 --- a/src/dsectoreffect.cpp +++ b/src/dsectoreffect.cpp @@ -64,7 +64,7 @@ DSectorEffect::DSectorEffect (sector_t *sector) m_Sector = sector; } -void DSectorEffect::Serialize (FArchive &arc) +void DSectorEffect::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Sector; @@ -90,7 +90,7 @@ void DMover::Destroy() Super::Destroy(); } -void DMover::Serialize (FArchive &arc) +void DMover::Serialize(FArchive &arc) { Super::Serialize (arc); arc << interpolation; diff --git a/src/dsectoreffect.h b/src/dsectoreffect.h index 792771fb6..775bca9ac 100644 --- a/src/dsectoreffect.h +++ b/src/dsectoreffect.h @@ -10,7 +10,7 @@ class DSectorEffect : public DThinker public: DSectorEffect (sector_t *sector); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Destroy(); sector_t *GetSector() const { return m_Sector; } @@ -32,7 +32,7 @@ protected: private: protected: DMover (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Destroy(); }; diff --git a/src/farchive.cpp b/src/farchive.cpp index 8bb39b35f..f454d3b7b 100644 --- a/src/farchive.cpp +++ b/src/farchive.cpp @@ -526,7 +526,7 @@ void FCompressedMemFile::Close () } } -void FCompressedMemFile::Serialize (FArchive &arc) +void FCompressedMemFile::Serialize(FArchive &arc) { if (arc.IsStoring ()) { diff --git a/src/farchive.h b/src/farchive.h index 44ae8c001..e874ae3dc 100644 --- a/src/farchive.h +++ b/src/farchive.h @@ -127,7 +127,7 @@ public: bool IsOpen () const; void GetSizes(unsigned int &one, unsigned int &two) const; - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); protected: bool FreeOnExplode () { return !m_SourceFromMem; } diff --git a/src/fragglescript/t_func.cpp b/src/fragglescript/t_func.cpp index 6c7196f62..8e2c31f2d 100644 --- a/src/fragglescript/t_func.cpp +++ b/src/fragglescript/t_func.cpp @@ -1780,7 +1780,8 @@ class DLightLevel : public DLighting public: DLightLevel(sector_t * s,int destlevel,int speed); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); + void Serialize(FArchive &arc); void Tick (); void Destroy() { Super::Destroy(); m_Sector->lightingdata=NULL; } }; @@ -1789,7 +1790,7 @@ public: IMPLEMENT_CLASS (DLightLevel) -void DLightLevel::Serialize (FArchive &arc) +void DLightLevel::Serialize(FArchive &arc) { Super::Serialize (arc); arc << destlevel << speed; diff --git a/src/g_doom/a_doomglobal.h b/src/g_doom/a_doomglobal.h index 23e181cc8..bcaaff887 100644 --- a/src/g_doom/a_doomglobal.h +++ b/src/g_doom/a_doomglobal.h @@ -29,7 +29,7 @@ public: void Tick (); void SetWeapon (EMarineWeapon); void SetSprite (PClassActor *source); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); int CurrentWeapon; diff --git a/src/g_doom/a_scriptedmarine.cpp b/src/g_doom/a_scriptedmarine.cpp index a3d33f555..a014891ea 100644 --- a/src/g_doom/a_scriptedmarine.cpp +++ b/src/g_doom/a_scriptedmarine.cpp @@ -21,7 +21,7 @@ static FRandom pr_m_fireshotgun2 ("SMarineFireSSG"); IMPLEMENT_CLASS (AScriptedMarine) -void AScriptedMarine::Serialize (FArchive &arc) +void AScriptedMarine::Serialize(FArchive &arc) { Super::Serialize (arc); diff --git a/src/g_heretic/a_hereticweaps.cpp b/src/g_heretic/a_hereticweaps.cpp index d20146339..fa35bf1f9 100644 --- a/src/g_heretic/a_hereticweaps.cpp +++ b/src/g_heretic/a_hereticweaps.cpp @@ -866,13 +866,13 @@ class ARainTracker : public AInventory { DECLARE_CLASS (ARainTracker, AInventory) public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); AActor *Rain1, *Rain2; }; IMPLEMENT_CLASS (ARainTracker) -void ARainTracker::Serialize (FArchive &arc) +void ARainTracker::Serialize(FArchive &arc) { Super::Serialize (arc); arc << Rain1 << Rain2; @@ -1140,7 +1140,7 @@ class APhoenixRod : public AWeapon { DECLARE_CLASS (APhoenixRod, AWeapon) public: - void Serialize (FArchive &arc) + void Serialize(FArchive &arc) { Super::Serialize (arc); arc << FlameCount; diff --git a/src/g_hexen/a_clericholy.cpp b/src/g_hexen/a_clericholy.cpp index 749ad3dad..7c8e8f8e7 100644 --- a/src/g_hexen/a_clericholy.cpp +++ b/src/g_hexen/a_clericholy.cpp @@ -31,7 +31,7 @@ class ACWeapWraithverge : public AClericWeapon { DECLARE_CLASS (ACWeapWraithverge, AClericWeapon) public: - void Serialize (FArchive &arc) + void Serialize(FArchive &arc) { Super::Serialize (arc); arc << CHolyCount; diff --git a/src/g_hexen/a_heresiarch.cpp b/src/g_hexen/a_heresiarch.cpp index 7784f0833..acddc588b 100644 --- a/src/g_hexen/a_heresiarch.cpp +++ b/src/g_hexen/a_heresiarch.cpp @@ -67,13 +67,13 @@ public: const PClass *StopBall; DAngle BallAngle; - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Die (AActor *source, AActor *inflictor, int dmgflags); }; IMPLEMENT_CLASS (AHeresiarch) -void AHeresiarch::Serialize (FArchive &arc) +void AHeresiarch::Serialize(FArchive &arc) { Super::Serialize (arc); arc << StopBall << BallAngle; @@ -105,7 +105,7 @@ public: DAngle AngleOffset; DAngle OldAngle; - void Serialize (FArchive &arc) + void Serialize(FArchive &arc) { Super::Serialize (arc); arc << AngleOffset << OldAngle; diff --git a/src/g_hexen/a_magestaff.cpp b/src/g_hexen/a_magestaff.cpp index 1bd20715d..9ad303179 100644 --- a/src/g_hexen/a_magestaff.cpp +++ b/src/g_hexen/a_magestaff.cpp @@ -29,7 +29,7 @@ class AMWeapBloodscourge : public AMageWeapon { DECLARE_CLASS (AMWeapBloodscourge, AMageWeapon) public: - void Serialize (FArchive &arc) + void Serialize(FArchive &arc) { Super::Serialize (arc); arc << MStaffCount; diff --git a/src/g_hexen/a_spike.cpp b/src/g_hexen/a_spike.cpp index 4770f5d3a..ced6c43a6 100644 --- a/src/g_hexen/a_spike.cpp +++ b/src/g_hexen/a_spike.cpp @@ -22,7 +22,7 @@ class AThrustFloor : public AActor DECLARE_CLASS (AThrustFloor, AActor) HAS_OBJECT_POINTERS public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Activate (AActor *activator); void Deactivate (AActor *activator); @@ -34,7 +34,7 @@ IMPLEMENT_POINTY_CLASS (AThrustFloor) DECLARE_POINTER (DirtClump) END_POINTERS -void AThrustFloor::Serialize (FArchive &arc) +void AThrustFloor::Serialize(FArchive &arc) { Super::Serialize (arc); arc << DirtClump; diff --git a/src/g_raven/a_minotaur.cpp b/src/g_raven/a_minotaur.cpp index 34ecfd161..281e1db49 100644 --- a/src/g_raven/a_minotaur.cpp +++ b/src/g_raven/a_minotaur.cpp @@ -79,7 +79,7 @@ void AMinotaurFriend::BeginPlay () StartTime = -1; } -void AMinotaurFriend::Serialize (FArchive &arc) +void AMinotaurFriend::Serialize(FArchive &arc) { Super::Serialize (arc); arc << StartTime; diff --git a/src/g_raven/ravenshared.h b/src/g_raven/ravenshared.h index 0010905cc..824bc7c86 100644 --- a/src/g_raven/ravenshared.h +++ b/src/g_raven/ravenshared.h @@ -23,7 +23,7 @@ public: void Die (AActor *source, AActor *inflictor, int dmgflags); bool OkayToSwitchTarget (AActor *other); void BeginPlay (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); }; #endif //__RAVENSHARED_H__ diff --git a/src/g_shared/a_action.cpp b/src/g_shared/a_action.cpp index 0e333a46e..3e3231c15 100644 --- a/src/g_shared/a_action.cpp +++ b/src/g_shared/a_action.cpp @@ -361,7 +361,7 @@ class DCorpsePointer : public DThinker public: DCorpsePointer (AActor *ptr); void Destroy (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); TObjPtr Corpse; DWORD Count; // Only the first corpse pointer's count is valid. private: @@ -435,7 +435,7 @@ void DCorpsePointer::Destroy () Super::Destroy (); } -void DCorpsePointer::Serialize (FArchive &arc) +void DCorpsePointer::Serialize(FArchive &arc) { Super::Serialize(arc); arc << Corpse << Count; diff --git a/src/g_shared/a_armor.cpp b/src/g_shared/a_armor.cpp index 2b783e380..b221c07b9 100644 --- a/src/g_shared/a_armor.cpp +++ b/src/g_shared/a_armor.cpp @@ -21,7 +21,7 @@ IMPLEMENT_CLASS (AHexenArmor) // //=========================================================================== -void ABasicArmor::Serialize (FArchive &arc) +void ABasicArmor::Serialize(FArchive &arc) { Super::Serialize (arc); arc << SavePercent << BonusCount << MaxAbsorb << MaxFullAbsorb << AbsorbCount << ArmorType << ActualSaveAmount; @@ -192,7 +192,7 @@ void ABasicArmor::AbsorbDamage (int damage, FName damageType, int &newdamage) // //=========================================================================== -void ABasicArmorPickup::Serialize (FArchive &arc) +void ABasicArmorPickup::Serialize(FArchive &arc) { Super::Serialize (arc); arc << SavePercent << SaveAmount << MaxAbsorb << MaxFullAbsorb; @@ -274,7 +274,7 @@ bool ABasicArmorPickup::Use (bool pickup) // //=========================================================================== -void ABasicArmorBonus::Serialize (FArchive &arc) +void ABasicArmorBonus::Serialize(FArchive &arc) { Super::Serialize (arc); arc << SavePercent << SaveAmount << MaxSaveAmount << BonusCount << BonusMax @@ -371,7 +371,7 @@ bool ABasicArmorBonus::Use (bool pickup) // //=========================================================================== -void AHexenArmor::Serialize (FArchive &arc) +void AHexenArmor::Serialize(FArchive &arc) { Super::Serialize (arc); arc << Slots[0] << Slots[1] << Slots[2] << Slots[3] diff --git a/src/g_shared/a_artifacts.cpp b/src/g_shared/a_artifacts.cpp index b5ac970ca..76426f554 100644 --- a/src/g_shared/a_artifacts.cpp +++ b/src/g_shared/a_artifacts.cpp @@ -101,7 +101,7 @@ bool APowerupGiver::Use (bool pickup) // //=========================================================================== -void APowerupGiver::Serialize (FArchive &arc) +void APowerupGiver::Serialize(FArchive &arc) { Super::Serialize (arc); arc << PowerupType; @@ -136,7 +136,7 @@ void APowerup::Tick () // //=========================================================================== -void APowerup::Serialize (FArchive &arc) +void APowerup::Serialize(FArchive &arc) { Super::Serialize (arc); arc << EffectTics << BlendColor << Mode; @@ -901,7 +901,7 @@ IMPLEMENT_CLASS (APowerTorch) // //=========================================================================== -void APowerTorch::Serialize (FArchive &arc) +void APowerTorch::Serialize(FArchive &arc) { Super::Serialize (arc); arc << NewTorch << NewTorchDelta; @@ -963,7 +963,7 @@ IMPLEMENT_CLASS (APowerFlight) // //=========================================================================== -void APowerFlight::Serialize (FArchive &arc) +void APowerFlight::Serialize(FArchive &arc) { Super::Serialize (arc); arc << HitCenterFrame; @@ -1899,7 +1899,7 @@ IMPLEMENT_CLASS(APowerMorph) // //=========================================================================== -void APowerMorph::Serialize (FArchive &arc) +void APowerMorph::Serialize(FArchive &arc) { Super::Serialize (arc); arc << PlayerClass << MorphStyle << MorphFlash << UnMorphFlash; diff --git a/src/g_shared/a_artifacts.h b/src/g_shared/a_artifacts.h index 2a52756ab..d742c2df4 100644 --- a/src/g_shared/a_artifacts.h +++ b/src/g_shared/a_artifacts.h @@ -16,7 +16,7 @@ public: virtual bool HandlePickup (AInventory *item); virtual AInventory *CreateCopy (AActor *other); virtual AInventory *CreateTossable (); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual void OwnerDied (); virtual bool GetNoTeleportFreeze(); virtual PalEntry GetBlend (); @@ -51,7 +51,7 @@ class APowerupGiver : public AInventory DECLARE_CLASS_WITH_META (APowerupGiver, AInventory, PClassPowerupGiver) public: virtual bool Use (bool pickup); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); PClassActor *PowerupType; @@ -121,7 +121,7 @@ class APowerTorch : public APowerLightAmp { DECLARE_CLASS (APowerTorch, APowerLightAmp) public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); protected: void DoEffect (); int NewTorch, NewTorchDelta; @@ -132,7 +132,7 @@ class APowerFlight : public APowerup DECLARE_CLASS (APowerFlight, APowerup) public: bool DrawPowerup (int x, int y); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); protected: void InitEffect (); @@ -272,7 +272,7 @@ class APowerMorph : public APowerup { DECLARE_CLASS( APowerMorph, APowerup ) public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void SetNoCallUndoMorph() { bNoCallUndoMorph = true; } FNameNoInit PlayerClass, MorphFlash, UnMorphFlash; diff --git a/src/g_shared/a_camera.cpp b/src/g_shared/a_camera.cpp index 64868231b..58eb3e114 100644 --- a/src/g_shared/a_camera.cpp +++ b/src/g_shared/a_camera.cpp @@ -55,7 +55,7 @@ public: void PostBeginPlay (); void Tick (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); protected: DAngle Center; DAngle Acc; @@ -65,7 +65,7 @@ protected: IMPLEMENT_CLASS (ASecurityCamera) -void ASecurityCamera::Serialize (FArchive &arc) +void ASecurityCamera::Serialize(FArchive &arc) { Super::Serialize (arc); arc << Center << Acc << Delta << Range; @@ -114,14 +114,14 @@ public: void PostBeginPlay (); void Tick (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); protected: DAngle MaxPitchChange; }; IMPLEMENT_CLASS (AAimingCamera) -void AAimingCamera::Serialize (FArchive &arc) +void AAimingCamera::Serialize(FArchive &arc) { Super::Serialize (arc); arc << MaxPitchChange; diff --git a/src/g_shared/a_decals.cpp b/src/g_shared/a_decals.cpp index 94e92e725..91ac40096 100644 --- a/src/g_shared/a_decals.cpp +++ b/src/g_shared/a_decals.cpp @@ -122,7 +122,7 @@ void DBaseDecal::Remove () WallNext = NULL; } -void DBaseDecal::Serialize (FArchive &arc) +void DBaseDecal::Serialize(FArchive &arc) { Super::Serialize (arc); arc << LeftDistance @@ -609,7 +609,7 @@ void DImpactDecal::SerializeTime (FArchive &arc) } } -void DImpactDecal::Serialize (FArchive &arc) +void DImpactDecal::Serialize(FArchive &arc) { Super::Serialize (arc); } diff --git a/src/g_shared/a_flashfader.cpp b/src/g_shared/a_flashfader.cpp index b5b4a0549..736f9e0da 100644 --- a/src/g_shared/a_flashfader.cpp +++ b/src/g_shared/a_flashfader.cpp @@ -26,7 +26,7 @@ void DFlashFader::Destroy () Super::Destroy(); } -void DFlashFader::Serialize (FArchive &arc) +void DFlashFader::Serialize(FArchive &arc) { Super::Serialize (arc); arc << TotalTics << StartTic << ForWho; diff --git a/src/g_shared/a_lightning.cpp b/src/g_shared/a_lightning.cpp index 2f2c4e235..72bde0078 100644 --- a/src/g_shared/a_lightning.cpp +++ b/src/g_shared/a_lightning.cpp @@ -35,7 +35,7 @@ DLightningThinker::~DLightningThinker () } } -void DLightningThinker::Serialize (FArchive &arc) +void DLightningThinker::Serialize(FArchive &arc) { int i; short *lights; diff --git a/src/g_shared/a_lightning.h b/src/g_shared/a_lightning.h index 1c4ca2a65..cca8d1fcc 100644 --- a/src/g_shared/a_lightning.h +++ b/src/g_shared/a_lightning.h @@ -13,7 +13,7 @@ class DLightningThinker : public DThinker public: DLightningThinker (); ~DLightningThinker (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); void ForceLightning (int mode); void TerminateLightning(); diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp index 57271f768..b8c5096c0 100644 --- a/src/g_shared/a_morph.cpp +++ b/src/g_shared/a_morph.cpp @@ -634,7 +634,7 @@ int AMorphProjectile::DoSpecialDamage (AActor *target, int damage, FName damaget return -1; } -void AMorphProjectile::Serialize (FArchive &arc) +void AMorphProjectile::Serialize(FArchive &arc) { Super::Serialize (arc); arc << PlayerClass << MonsterClass << Duration << MorphStyle << MorphFlash << UnMorphFlash; @@ -647,7 +647,7 @@ IMPLEMENT_POINTY_CLASS (AMorphedMonster) DECLARE_POINTER (UnmorphedMe) END_POINTERS -void AMorphedMonster::Serialize (FArchive &arc) +void AMorphedMonster::Serialize(FArchive &arc) { Super::Serialize (arc); arc << UnmorphedMe << UnmorphTime << MorphStyle << MorphExitFlash << FlagsSave; diff --git a/src/g_shared/a_movingcamera.cpp b/src/g_shared/a_movingcamera.cpp index 202e1823f..c18e6c483 100644 --- a/src/g_shared/a_movingcamera.cpp +++ b/src/g_shared/a_movingcamera.cpp @@ -60,7 +60,7 @@ public: AInterpolationPoint *ScanForLoop (); void FormChain (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); TObjPtr Next; }; @@ -69,7 +69,7 @@ IMPLEMENT_POINTY_CLASS (AInterpolationPoint) DECLARE_POINTER (Next) END_POINTERS -void AInterpolationPoint::Serialize (FArchive &arc) +void AInterpolationPoint::Serialize(FArchive &arc) { Super::Serialize (arc); arc << Next; @@ -166,7 +166,7 @@ protected: virtual bool Interpolate (); virtual void NewNode (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); bool bActive, bJustStepped; TObjPtr PrevNode, CurrNode; @@ -179,7 +179,7 @@ IMPLEMENT_POINTY_CLASS (APathFollower) DECLARE_POINTER (CurrNode) END_POINTERS -void APathFollower::Serialize (FArchive &arc) +void APathFollower::Serialize(FArchive &arc) { Super::Serialize (arc); arc << bActive << bJustStepped << PrevNode << CurrNode << Time << HoldTime; @@ -577,7 +577,7 @@ class AMovingCamera : public APathFollower public: void PostBeginPlay (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); protected: bool Interpolate (); @@ -588,7 +588,7 @@ IMPLEMENT_POINTY_CLASS (AMovingCamera) DECLARE_POINTER (Activator) END_POINTERS -void AMovingCamera::Serialize (FArchive &arc) +void AMovingCamera::Serialize(FArchive &arc) { Super::Serialize (arc); arc << Activator; diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp index c72366201..1a8202916 100644 --- a/src/g_shared/a_pickups.cpp +++ b/src/g_shared/a_pickups.cpp @@ -89,7 +89,7 @@ IMPLEMENT_CLASS (AAmmo) // //=========================================================================== -void AAmmo::Serialize (FArchive &arc) +void AAmmo::Serialize(FArchive &arc) { Super::Serialize (arc); arc << BackpackAmount << BackpackMaxAmount; @@ -514,7 +514,7 @@ void AInventory::Tick () // //=========================================================================== -void AInventory::Serialize (FArchive &arc) +void AInventory::Serialize(FArchive &arc) { Super::Serialize (arc); arc << Owner << Amount << MaxAmount << RespawnTics << ItemFlags << Icon << PickupSound << SpawnPointClass; @@ -1809,7 +1809,7 @@ bool AHealthPickup::Use (bool pickup) // //=========================================================================== -void AHealthPickup::Serialize (FArchive &arc) +void AHealthPickup::Serialize(FArchive &arc) { Super::Serialize(arc); arc << autousemode; @@ -1823,7 +1823,7 @@ void AHealthPickup::Serialize (FArchive &arc) // //=========================================================================== -void ABackpackItem::Serialize (FArchive &arc) +void ABackpackItem::Serialize(FArchive &arc) { Super::Serialize (arc); arc << bDepleted; diff --git a/src/g_shared/a_pickups.h b/src/g_shared/a_pickups.h index 0023cd271..9122ffd12 100644 --- a/src/g_shared/a_pickups.h +++ b/src/g_shared/a_pickups.h @@ -153,7 +153,7 @@ class AInventory : public AActor HAS_OBJECT_POINTERS public: virtual void Touch (AActor *toucher); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual void MarkPrecacheSounds() const; virtual void BeginPlay (); @@ -254,7 +254,7 @@ class AAmmo : public AInventory { DECLARE_CLASS_WITH_META(AAmmo, AInventory, PClassAmmo) public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); AInventory *CreateCopy (AActor *other); bool HandlePickup (AInventory *item); PClassActor *GetParentAmmo () const; @@ -311,7 +311,7 @@ public: bool bAltFire; // Set when this weapon's alternate fire is used. virtual void MarkPrecacheSounds() const; - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual bool ShouldStay (); virtual void AttachToOwner (AActor *other); virtual bool HandlePickup (AInventory *item); @@ -431,7 +431,7 @@ class AHealthPickup : public AInventory public: int autousemode; - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual AInventory *CreateCopy (AActor *other); virtual AInventory *CreateTossable (); virtual bool HandlePickup (AInventory *item); @@ -451,7 +451,7 @@ class ABasicArmor : public AArmor { DECLARE_CLASS (ABasicArmor, AArmor) public: - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual void Tick (); virtual AInventory *CreateCopy (AActor *other); virtual bool HandlePickup (AInventory *item); @@ -471,7 +471,7 @@ class ABasicArmorPickup : public AArmor { DECLARE_CLASS (ABasicArmorPickup, AArmor) public: - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual AInventory *CreateCopy (AActor *other); virtual bool Use (bool pickup); @@ -486,7 +486,7 @@ class ABasicArmorBonus : public AArmor { DECLARE_CLASS (ABasicArmorBonus, AArmor) public: - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual AInventory *CreateCopy (AActor *other); virtual bool Use (bool pickup); @@ -505,7 +505,7 @@ class AHexenArmor : public AArmor { DECLARE_CLASS (AHexenArmor, AArmor) public: - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual AInventory *CreateCopy (AActor *other); virtual AInventory *CreateTossable (); virtual bool HandlePickup (AInventory *item); @@ -533,7 +533,7 @@ class APuzzleItem : public AInventory { DECLARE_CLASS_WITH_META(APuzzleItem, AInventory, PClassPuzzleItem) public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); bool ShouldStay (); bool Use (bool pickup); bool HandlePickup (AInventory *item); @@ -555,7 +555,7 @@ class ABackpackItem : public AInventory { DECLARE_CLASS (ABackpackItem, AInventory) public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); bool HandlePickup (AInventory *item); AInventory *CreateCopy (AActor *other); AInventory *CreateTossable (); diff --git a/src/g_shared/a_puzzleitems.cpp b/src/g_shared/a_puzzleitems.cpp index dff532f17..774585ae9 100644 --- a/src/g_shared/a_puzzleitems.cpp +++ b/src/g_shared/a_puzzleitems.cpp @@ -20,7 +20,7 @@ void PClassPuzzleItem::DeriveData(PClass *newclass) IMPLEMENT_CLASS(APuzzleItem) -void APuzzleItem::Serialize (FArchive &arc) +void APuzzleItem::Serialize(FArchive &arc) { Super::Serialize (arc); arc << PuzzleItemNumber; diff --git a/src/g_shared/a_quake.cpp b/src/g_shared/a_quake.cpp index 63394e02a..13194a06e 100644 --- a/src/g_shared/a_quake.cpp +++ b/src/g_shared/a_quake.cpp @@ -64,7 +64,7 @@ DEarthquake::DEarthquake(AActor *center, int intensityX, int intensityY, int int // //========================================================================== -void DEarthquake::Serialize (FArchive &arc) +void DEarthquake::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Spot << m_Intensity << m_Countdown diff --git a/src/g_shared/a_sharedglobal.h b/src/g_shared/a_sharedglobal.h index 029653bb1..b4a5fbbf7 100644 --- a/src/g_shared/a_sharedglobal.h +++ b/src/g_shared/a_sharedglobal.h @@ -24,7 +24,7 @@ public: DBaseDecal (const AActor *actor); DBaseDecal (const DBaseDecal *basis); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Destroy (); FTextureID StickToWall(side_t *wall, double x, double y, F3DFloor * ffloor); double GetRealZ (const side_t *wall) const; @@ -70,7 +70,7 @@ public: void BeginPlay (); void Destroy (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); static void SerializeTime (FArchive &arc); protected: @@ -122,7 +122,7 @@ public: float r2, float g2, float b2, float a2, float time, AActor *who); void Destroy (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); AActor *WhoFor() { return ForWho; } void Cancel (); @@ -165,7 +165,7 @@ public: int damrad, int tremrad, FSoundID quakesfx, int flags, double waveSpeedX, double waveSpeedY, double waveSpeedZ, int falloff, int highpoint, double rollIntensity, double rollWave); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); TObjPtr m_Spot; double m_TremorRadius, m_DamageRadius; @@ -194,7 +194,7 @@ class AMorphProjectile : public AActor DECLARE_CLASS (AMorphProjectile, AActor) public: int DoSpecialDamage (AActor *target, int damage, FName damagetype); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); FNameNoInit PlayerClass, MonsterClass, MorphFlash, UnMorphFlash; int Duration, MorphStyle; @@ -206,7 +206,7 @@ class AMorphedMonster : public AActor HAS_OBJECT_POINTERS public: void Tick (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Die (AActor *source, AActor *inflictor, int dmgflags); void Destroy (); diff --git a/src/g_shared/a_soundsequence.cpp b/src/g_shared/a_soundsequence.cpp index b7ef2d25b..c1b9ced78 100644 --- a/src/g_shared/a_soundsequence.cpp +++ b/src/g_shared/a_soundsequence.cpp @@ -74,7 +74,7 @@ class ASoundSequenceSlot : public AActor DECLARE_CLASS (ASoundSequenceSlot, AActor) HAS_OBJECT_POINTERS public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); TObjPtr Sequence; }; @@ -89,7 +89,7 @@ END_POINTERS // //========================================================================== -void ASoundSequenceSlot::Serialize (FArchive &arc) +void ASoundSequenceSlot::Serialize(FArchive &arc) { Super::Serialize (arc); arc << Sequence; diff --git a/src/g_shared/a_weaponpiece.cpp b/src/g_shared/a_weaponpiece.cpp index 2d7549db7..7068fe275 100644 --- a/src/g_shared/a_weaponpiece.cpp +++ b/src/g_shared/a_weaponpiece.cpp @@ -17,7 +17,7 @@ void PClassWeaponPiece::ReplaceClassRef(PClass *oldclass, PClass *newclass) } -void AWeaponHolder::Serialize (FArchive &arc) +void AWeaponHolder::Serialize(FArchive &arc) { Super::Serialize(arc); arc << PieceMask << PieceWeapon; @@ -29,7 +29,7 @@ IMPLEMENT_POINTY_CLASS (AWeaponPiece) END_POINTERS -void AWeaponPiece::Serialize (FArchive &arc) +void AWeaponPiece::Serialize(FArchive &arc) { Super::Serialize (arc); arc << WeaponClass << FullWeapon << PieceValue; diff --git a/src/g_shared/a_weaponpiece.h b/src/g_shared/a_weaponpiece.h index 071ea6891..4f201fe19 100644 --- a/src/g_shared/a_weaponpiece.h +++ b/src/g_shared/a_weaponpiece.h @@ -15,7 +15,7 @@ class AWeaponPiece : public AInventory protected: bool PrivateShouldStay (); public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); bool TryPickup (AActor *&toucher); bool TryPickupRestricted (AActor *&toucher); bool ShouldStay (); @@ -37,5 +37,5 @@ public: int PieceMask; const PClass * PieceWeapon; - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); }; diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp index 575914fe8..ed7c02531 100644 --- a/src/g_shared/a_weapons.cpp +++ b/src/g_shared/a_weapons.cpp @@ -73,7 +73,7 @@ void PClassWeapon::ReplaceClassRef(PClass *oldclass, PClass *newclass) // //=========================================================================== -void AWeapon::Serialize (FArchive &arc) +void AWeapon::Serialize(FArchive &arc) { Super::Serialize (arc); arc << WeaponFlags diff --git a/src/g_shared/hudmessages.cpp b/src/g_shared/hudmessages.cpp index 32a8d2de5..7c86c98ac 100644 --- a/src/g_shared/hudmessages.cpp +++ b/src/g_shared/hudmessages.cpp @@ -504,7 +504,7 @@ DHUDMessageFadeOut::DHUDMessageFadeOut (FFont *font, const char *text, float x, // //============================================================================ -void DHUDMessageFadeOut::Serialize (FArchive &arc) +void DHUDMessageFadeOut::Serialize(FArchive &arc) { Super::Serialize (arc); arc << FadeOutTics; @@ -609,7 +609,7 @@ DHUDMessageFadeInOut::DHUDMessageFadeInOut (FFont *font, const char *text, float // //============================================================================ -void DHUDMessageFadeInOut::Serialize (FArchive &arc) +void DHUDMessageFadeInOut::Serialize(FArchive &arc) { Super::Serialize (arc); arc << FadeInTics; @@ -718,7 +718,7 @@ DHUDMessageTypeOnFadeOut::DHUDMessageTypeOnFadeOut (FFont *font, const char *tex // //============================================================================ -void DHUDMessageTypeOnFadeOut::Serialize (FArchive &arc) +void DHUDMessageTypeOnFadeOut::Serialize(FArchive &arc) { Super::Serialize (arc); arc << TypeOnTime << CurrLine << LineVisible << LineLen; diff --git a/src/g_shared/sbar.h b/src/g_shared/sbar.h index 03901f66f..87242988e 100644 --- a/src/g_shared/sbar.h +++ b/src/g_shared/sbar.h @@ -71,7 +71,7 @@ public: EColorRange textColor, float holdTime); virtual ~DHUDMessage (); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); void Draw (int bottom, int visibility); virtual void ResetText (const char *text); @@ -157,7 +157,7 @@ public: DHUDMessageFadeOut (FFont *font, const char *text, float x, float y, int hudwidth, int hudheight, EColorRange textColor, float holdTime, float fadeOutTime); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual void DoDraw (int linenum, int x, int y, bool clean, int hudheight); virtual bool Tick (); @@ -176,7 +176,7 @@ public: DHUDMessageFadeInOut (FFont *font, const char *text, float x, float y, int hudwidth, int hudheight, EColorRange textColor, float holdTime, float fadeInTime, float fadeOutTime); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual void DoDraw (int linenum, int x, int y, bool clean, int hudheight); virtual bool Tick (); @@ -195,7 +195,7 @@ public: DHUDMessageTypeOnFadeOut (FFont *font, const char *text, float x, float y, int hudwidth, int hudheight, EColorRange textColor, float typeTime, float holdTime, float fadeOutTime); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual void DoDraw (int linenum, int x, int y, bool clean, int hudheight); virtual bool Tick (); virtual void ScreenSizeChanged (); @@ -355,7 +355,7 @@ public: static void AddBlend (float r, float g, float b, float a, float v_blend[4]); - virtual void Serialize (FArchive &arc); + virtual void Serialize(FArchive &arc); virtual void Tick (); virtual void Draw (EHudState state); diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp index f66ec187d..b0a1f6a5d 100644 --- a/src/g_shared/shared_sbar.cpp +++ b/src/g_shared/shared_sbar.cpp @@ -1654,7 +1654,7 @@ void DBaseStatusBar::ReceivedWeapon (AWeapon *weapon) { } -void DBaseStatusBar::Serialize (FArchive &arc) +void DBaseStatusBar::Serialize(FArchive &arc) { for (size_t i = 0; i < countof(Messages); ++i) { diff --git a/src/g_strife/a_strifeglobal.h b/src/g_strife/a_strifeglobal.h index a91052b52..58974e41e 100644 --- a/src/g_strife/a_strifeglobal.h +++ b/src/g_strife/a_strifeglobal.h @@ -55,7 +55,7 @@ class ASigil : public AWeapon public: bool HandlePickup (AInventory *item); AInventory *CreateCopy (AActor *other); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); bool SpecialDropAction (AActor *dropper); static int GiveSigilPiece (AActor *daPlayer); void BeginPlay(); diff --git a/src/g_strife/a_strifeweapons.cpp b/src/g_strife/a_strifeweapons.cpp index 24e7fb5c7..de03e6049 100644 --- a/src/g_strife/a_strifeweapons.cpp +++ b/src/g_strife/a_strifeweapons.cpp @@ -753,7 +753,7 @@ void ASigil::BeginPlay() // //============================================================================ -void ASigil::Serialize (FArchive &arc) +void ASigil::Serialize(FArchive &arc) { Super::Serialize (arc); arc << NumPieces << DownPieces; diff --git a/src/p_acs.cpp b/src/p_acs.cpp index ffac7a78f..9a7137eb2 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -1367,7 +1367,7 @@ public: int tag, int height, int special, int arg0, int arg1, int arg2, int arg3, int arg4); void Tick (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); private: sector_t *Sector; double WatchD, LastD; @@ -1417,7 +1417,7 @@ DPlaneWatcher::DPlaneWatcher (AActor *it, line_t *line, int lineSide, bool ceili } } -void DPlaneWatcher::Serialize (FArchive &arc) +void DPlaneWatcher::Serialize(FArchive &arc) { Super::Serialize (arc); @@ -2927,7 +2927,7 @@ DACSThinker::~DACSThinker () ActiveThinker = NULL; } -void DACSThinker::Serialize (FArchive &arc) +void DACSThinker::Serialize(FArchive &arc) { int scriptnum; int scriptcount = 0; @@ -3056,7 +3056,7 @@ inline FArchive &operator<< (FArchive &arc, DLevelScript::EScriptState &state) return arc; } -void DLevelScript::Serialize (FArchive &arc) +void DLevelScript::Serialize(FArchive &arc) { DWORD i; diff --git a/src/p_acs.h b/src/p_acs.h index 243e2ccf3..9e2428cbf 100644 --- a/src/p_acs.h +++ b/src/p_acs.h @@ -859,7 +859,7 @@ public: const int *args, int argcount, int flags); ~DLevelScript (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); int RunScript (); inline void SetState (EScriptState newstate) { state = newstate; } @@ -944,7 +944,7 @@ public: DACSThinker (); ~DACSThinker (); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); typedef TMap ScriptMap; diff --git a/src/p_ceiling.cpp b/src/p_ceiling.cpp index 888b67b6c..7590234fc 100644 --- a/src/p_ceiling.cpp +++ b/src/p_ceiling.cpp @@ -72,7 +72,7 @@ DCeiling::DCeiling () // //============================================================================ -void DCeiling::Serialize (FArchive &arc) +void DCeiling::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Type diff --git a/src/p_doors.cpp b/src/p_doors.cpp index ab551de1b..a614db6a5 100644 --- a/src/p_doors.cpp +++ b/src/p_doors.cpp @@ -59,7 +59,7 @@ DDoor::DDoor () { } -void DDoor::Serialize (FArchive &arc) +void DDoor::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Type @@ -530,7 +530,7 @@ DAnimatedDoor::DAnimatedDoor (sector_t *sec) { } -void DAnimatedDoor::Serialize (FArchive &arc) +void DAnimatedDoor::Serialize(FArchive &arc) { Super::Serialize (arc); diff --git a/src/p_floor.cpp b/src/p_floor.cpp index ccb1c82e9..67cc6efa7 100644 --- a/src/p_floor.cpp +++ b/src/p_floor.cpp @@ -84,7 +84,7 @@ DFloor::DFloor () { } -void DFloor::Serialize (FArchive &arc) +void DFloor::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Type @@ -855,7 +855,7 @@ DElevator::DElevator (sector_t *sec) m_Interp_Ceiling = sec->SetInterpolation(sector_t::CeilingMove, true); } -void DElevator::Serialize (FArchive &arc) +void DElevator::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Type @@ -1136,7 +1136,7 @@ DWaggleBase::DWaggleBase () { } -void DWaggleBase::Serialize (FArchive &arc) +void DWaggleBase::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_OriginalDist diff --git a/src/p_lights.cpp b/src/p_lights.cpp index 90d1da869..59e21fce6 100644 --- a/src/p_lights.cpp +++ b/src/p_lights.cpp @@ -197,7 +197,7 @@ DFireFlicker::DFireFlicker () { } -void DFireFlicker::Serialize (FArchive &arc) +void DFireFlicker::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Count << m_MaxLight << m_MinLight; @@ -262,7 +262,7 @@ DFlicker::DFlicker () { } -void DFlicker::Serialize (FArchive &arc) +void DFlicker::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Count << m_MaxLight << m_MinLight; @@ -336,7 +336,7 @@ DLightFlash::DLightFlash () { } -void DLightFlash::Serialize (FArchive &arc) +void DLightFlash::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Count << m_MaxLight << m_MaxTime << m_MinLight << m_MinTime; @@ -407,7 +407,7 @@ DStrobe::DStrobe () { } -void DStrobe::Serialize (FArchive &arc) +void DStrobe::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Count << m_MaxLight << m_MinLight << m_DarkTime << m_BrightTime; @@ -661,7 +661,7 @@ DGlow::DGlow () { } -void DGlow::Serialize (FArchive &arc) +void DGlow::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Direction << m_MaxLight << m_MinLight; @@ -728,7 +728,7 @@ DGlow2::DGlow2 () { } -void DGlow2::Serialize (FArchive &arc) +void DGlow2::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_End << m_MaxTics << m_OneShot << m_Start << m_Tics; @@ -857,7 +857,7 @@ DPhased::DPhased () { } -void DPhased::Serialize (FArchive &arc) +void DPhased::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_BaseLevel << m_Phase; diff --git a/src/p_pillar.cpp b/src/p_pillar.cpp index 2a134cc50..e68187b4c 100644 --- a/src/p_pillar.cpp +++ b/src/p_pillar.cpp @@ -72,7 +72,7 @@ void DPillar::Destroy() Super::Destroy(); } -void DPillar::Serialize (FArchive &arc) +void DPillar::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Type diff --git a/src/p_plats.cpp b/src/p_plats.cpp index 96fec71c1..dec3894b0 100644 --- a/src/p_plats.cpp +++ b/src/p_plats.cpp @@ -56,7 +56,7 @@ DPlat::DPlat () { } -void DPlat::Serialize (FArchive &arc) +void DPlat::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Speed diff --git a/src/p_pusher.cpp b/src/p_pusher.cpp index 4fb3b8f1f..511e6bbb4 100644 --- a/src/p_pusher.cpp +++ b/src/p_pusher.cpp @@ -52,7 +52,7 @@ public: DPusher (); DPusher (EPusher type, line_t *l, int magnitude, int angle, AActor *source, int affectee); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); int CheckForSectorMatch (EPusher type, int tag); void ChangeValues (int magnitude, int angle) { @@ -91,7 +91,7 @@ inline FArchive &operator<< (FArchive &arc, DPusher::EPusher &type) return arc; } -void DPusher::Serialize (FArchive &arc) +void DPusher::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Type diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index 550e9455d..0735eb128 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -65,6 +65,7 @@ #include "serializer.h" // just the stuff that already got converted to FSerializer so that it can be seen as 'done' when searching. +#define COMMON_STUFF #include "zzz_old.cpp" void CopyPlayer (player_t *dst, player_t *src, const char *name); diff --git a/src/p_scroll.cpp b/src/p_scroll.cpp index 52be13d56..9dba9e4ca 100644 --- a/src/p_scroll.cpp +++ b/src/p_scroll.cpp @@ -46,7 +46,7 @@ public: DScroller (double dx, double dy, const line_t *l, int control, int accel, EScrollPos scrollpos = EScrollPos::scw_all); void Destroy(); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); bool AffectsWall (int wallnum) const { return m_Type == EScroll::sc_side && m_Affectee == wallnum; } @@ -114,7 +114,7 @@ EScrollPos operator &(EScrollPos one, EScrollPos two) // //----------------------------------------------------------------------------- -void DScroller::Serialize (FArchive &arc) +void DScroller::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Type diff --git a/src/p_spec.cpp b/src/p_spec.cpp index 4c3bdb488..c10d5dd2a 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -648,7 +648,7 @@ class DLightTransfer : public DThinker DLightTransfer() {} public: DLightTransfer (sector_t *srcSec, int target, bool copyFloor); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); protected: @@ -662,7 +662,7 @@ protected: IMPLEMENT_CLASS (DLightTransfer) -void DLightTransfer::Serialize (FArchive &arc) +void DLightTransfer::Serialize(FArchive &arc) { Super::Serialize (arc); arc << LastLight; @@ -736,7 +736,7 @@ class DWallLightTransfer : public DThinker DWallLightTransfer() {} public: DWallLightTransfer (sector_t *srcSec, int target, BYTE flags); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); protected: @@ -750,7 +750,7 @@ protected: IMPLEMENT_CLASS (DWallLightTransfer) -void DWallLightTransfer::Serialize (FArchive &arc) +void DWallLightTransfer::Serialize(FArchive &arc) { Super::Serialize (arc); arc << LastLight; diff --git a/src/p_spec.h b/src/p_spec.h index d7abd4b42..0e1b9a142 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -184,7 +184,7 @@ public: platRaiseAndStayLockout, }; - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); bool IsLift() const { return m_Type == platDownWaitUpStay || m_Type == platDownWaitUpStayStone; } @@ -241,7 +241,7 @@ public: DPillar (sector_t *sector, EPillar type, double speed, double height, double height2, int crush, bool hexencrush); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); void Destroy(); @@ -283,7 +283,7 @@ public: DDoor (sector_t *sector); DDoor (sector_t *sec, EVlDoor type, double speed, int delay, int lightTag, int topcountdown); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); protected: EVlDoor m_Type; @@ -325,7 +325,7 @@ public: DAnimatedDoor (sector_t *sector); DAnimatedDoor (sector_t *sec, line_t *line, int speed, int delay, FDoorAnimation *anim); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); bool StartClosing (); @@ -405,7 +405,7 @@ public: DCeiling (sector_t *sec); DCeiling (sector_t *sec, double speed1, double speed2, int silent); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); protected: @@ -508,7 +508,7 @@ public: DFloor (sector_t *sec); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); //protected: @@ -573,7 +573,7 @@ public: DElevator (sector_t *sec); void Destroy(); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); protected: @@ -601,7 +601,7 @@ class DWaggleBase : public DMover public: DWaggleBase (sector_t *sec); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); protected: double m_OriginalDist; diff --git a/src/p_switch.cpp b/src/p_switch.cpp index fdea7747b..0388176e2 100644 --- a/src/p_switch.cpp +++ b/src/p_switch.cpp @@ -61,7 +61,7 @@ public: DActiveButton (); DActiveButton (side_t *, int, FSwitchDef *, const DVector2 &pos, bool flippable); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); side_t *m_Side; @@ -354,7 +354,7 @@ DActiveButton::DActiveButton (side_t *side, int Where, FSwitchDef *Switch, // //========================================================================== -void DActiveButton::Serialize (FArchive &arc) +void DActiveButton::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Side << m_Part << m_SwitchDef << m_Frame << m_Timer << bFlippable << m_Pos << bReturning; diff --git a/src/p_user.cpp b/src/p_user.cpp index b602432b3..25bdd70aa 100644 --- a/src/p_user.cpp +++ b/src/p_user.cpp @@ -631,7 +631,7 @@ END_POINTERS IMPLEMENT_CLASS (APlayerChunk) -void APlayerPawn::Serialize (FArchive &arc) +void APlayerPawn::Serialize(FArchive &arc) { Super::Serialize (arc); @@ -3001,7 +3001,7 @@ void P_UnPredictPlayer () } } -void player_t::Serialize (FArchive &arc) +void player_t::Serialize(FArchive &arc) { int i; FString skinname; diff --git a/src/po_man.cpp b/src/po_man.cpp index e449e0d67..f6b1ec2b6 100644 --- a/src/po_man.cpp +++ b/src/po_man.cpp @@ -87,7 +87,7 @@ class DMovePoly : public DPolyAction DECLARE_CLASS (DMovePoly, DPolyAction) public: DMovePoly (int polyNum); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); protected: DMovePoly (); @@ -118,7 +118,7 @@ class DPolyDoor : public DMovePoly DECLARE_CLASS (DPolyDoor, DMovePoly) public: DPolyDoor (int polyNum, podoortype_t type); - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void Tick (); protected: DAngle m_Direction; @@ -199,7 +199,7 @@ DPolyAction::DPolyAction () { } -void DPolyAction::Serialize (FArchive &arc) +void DPolyAction::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_PolyObj << m_Speed << m_Dist << m_Interpolation; @@ -277,7 +277,7 @@ DMovePoly::DMovePoly () { } -void DMovePoly::Serialize (FArchive &arc) +void DMovePoly::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Angle << m_Speed; @@ -331,7 +331,7 @@ DPolyDoor::DPolyDoor () { } -void DPolyDoor::Serialize (FArchive &arc) +void DPolyDoor::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Direction << m_TotalDist << m_Tics << m_WaitTics << m_Type << m_Close; diff --git a/src/r_utility.cpp b/src/r_utility.cpp index ebe36dc9d..d5ab09b4c 100644 --- a/src/r_utility.cpp +++ b/src/r_utility.cpp @@ -1041,7 +1041,7 @@ void FCanvasTextureInfo::EmptyList () // //========================================================================== -void FCanvasTextureInfo::Serialize (FArchive &arc) +void FCanvasTextureInfo::Serialize(FArchive &arc) { if (arc.IsStoring ()) { diff --git a/src/r_utility.h b/src/r_utility.h index 09a8b5667..4d004e835 100644 --- a/src/r_utility.h +++ b/src/r_utility.h @@ -113,7 +113,7 @@ struct FCanvasTextureInfo static void Add (AActor *viewpoint, FTextureID picnum, int fov); static void UpdateAll (); static void EmptyList (); - static void Serialize (FArchive &arc); + static void Serialize(FArchive &arc); static void Mark(); private: diff --git a/src/s_advsound.cpp b/src/s_advsound.cpp index 3d0fe1bac..0c57288f9 100644 --- a/src/s_advsound.cpp +++ b/src/s_advsound.cpp @@ -2102,7 +2102,7 @@ class AAmbientSound : public AActor { DECLARE_CLASS (AAmbientSound, AActor) public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void MarkPrecacheSounds () const; void BeginPlay (); @@ -2125,7 +2125,7 @@ IMPLEMENT_CLASS (AAmbientSound) // //========================================================================== -void AAmbientSound::Serialize (FArchive &arc) +void AAmbientSound::Serialize(FArchive &arc) { Super::Serialize (arc); arc << bActive << NextCheck; diff --git a/src/s_sndseq.cpp b/src/s_sndseq.cpp index 06d5883b6..cb700621c 100644 --- a/src/s_sndseq.cpp +++ b/src/s_sndseq.cpp @@ -298,7 +298,7 @@ DSeqNode::DSeqNode () m_Next = m_Prev = m_ChildSeqNode = m_ParentSeqNode = NULL; } -void DSeqNode::Serialize (FArchive &arc) +void DSeqNode::Serialize(FArchive &arc) { int seqOffset; unsigned int i; @@ -425,7 +425,7 @@ IMPLEMENT_POINTY_CLASS (DSeqActorNode) DECLARE_POINTER (m_Actor) END_POINTERS -void DSeqActorNode::Serialize (FArchive &arc) +void DSeqActorNode::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Actor; @@ -433,7 +433,7 @@ void DSeqActorNode::Serialize (FArchive &arc) IMPLEMENT_CLASS (DSeqPolyNode) -void DSeqPolyNode::Serialize (FArchive &arc) +void DSeqPolyNode::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Poly; @@ -441,7 +441,7 @@ void DSeqPolyNode::Serialize (FArchive &arc) IMPLEMENT_CLASS (DSeqSectorNode) -void DSeqSectorNode::Serialize (FArchive &arc) +void DSeqSectorNode::Serialize(FArchive &arc) { Super::Serialize (arc); arc << m_Sector << Channel; diff --git a/src/s_sndseq.h b/src/s_sndseq.h index d27dc86da..89a95505a 100644 --- a/src/s_sndseq.h +++ b/src/s_sndseq.h @@ -20,7 +20,7 @@ class DSeqNode : public DObject DECLARE_CLASS (DSeqNode, DObject) HAS_OBJECT_POINTERS public: - void Serialize (FArchive &arc); + void Serialize(FArchive &arc); void StopAndDestroy (); void Destroy (); void Tick (); diff --git a/src/tflags.h b/src/tflags.h index 5f44c8391..1affb6cbc 100644 --- a/src/tflags.h +++ b/src/tflags.h @@ -83,7 +83,7 @@ public: operator TT() const { return Value; } // Serialize to FArchive - FArchive& Serialize (FArchive& arc) + FArchive& Serialize(FArchive& arc) { arc << Value; return arc; diff --git a/src/zzz_old.cpp b/src/zzz_old.cpp index a4d6df95d..1a6064856 100644 --- a/src/zzz_old.cpp +++ b/src/zzz_old.cpp @@ -1,3 +1,5 @@ +#ifdef COMMON_STUFF + // For NULL states, which aren't owned by any actor, the owner // is recorded as AActor with the following state. AActor should // never actually have this many states of its own, so this @@ -691,7 +693,35 @@ FArchive &operator<< (FArchive &arc, FState *&state) return arc; } -void DObject::Serialize (FArchive &arc) +void DObject::Serialize(FArchive &arc) { ObjectFlags |= OF_SerialSuccess; } + + +class DLightLevel : public DLighting +{ + DECLARE_CLASS(DLightLevel, DLighting) + + unsigned char destlevel; + unsigned char speed; + + DLightLevel() {} + +public: + + DLightLevel(sector_t * s, int destlevel, int speed); + void Serialize(FArchive &arc); + void Serialize(FSerializer &arc); + void Tick(); + void Destroy() { Super::Destroy(); m_Sector->lightingdata = NULL; } +}; + +void DLightLevel::Serialize(FArchive &arc) +{ + Super::Serialize(arc); + arc << destlevel << speed; + if (arc.IsLoading()) m_Sector->lightingdata = this; +} + +#endif \ No newline at end of file