Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-09 20:18:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Formatted document

Browse source
This commit is contained in:
smallmodel 2023-08-08 23:46:45 +02:00
parent 484b2a8900
commit 94c501e71b
No known key found for this signature in database
GPG key ID: A96F163ED4891440
2 changed files with 2232 additions and 2978 deletions
Download patch file Download diff file Expand all files Collapse all files

1427
code/fgame/trigger.cpp
View file

File diff suppressed because it is too large Load diff

97
code/fgame/trigger.h
View file

@ -124,10 +124,7 @@ class Trigger : public Animate
void Archive(Archiver& arc) override;
};
inline void Trigger::Archive
(
Archiver &arc
)
inline void Trigger::Archive(Archiver& arc)
{
Animate::Archive(arc);
@ -137,8 +134,7 @@ inline void Trigger::Archive
arc.ArchiveBoolean(&triggerActivated);
arc.ArchiveInteger(&count);
arc.ArchiveString(&noise);
if ( arc.Loading() )
{
if (arc.Loading()) {
SetNoise(noise.c_str());
}
arc.ArchiveString(&message);
@ -188,10 +184,7 @@ public:
void SetTriggerTime(Entity *other, float time);
};
inline void TriggerAll::Archive
(
Archiver& arc
)
inline void TriggerAll::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -213,10 +206,7 @@ class TouchField : public Trigger
void Archive(Archiver &arc) override;
};
inline void TouchField::Archive
(
Archiver &arc
)
inline void TouchField::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -246,10 +236,7 @@ public:
void Archive(Archiver& arc) override;
};
inline void TriggerSave::Archive
(
Archiver &arc
)
inline void TriggerSave::Archive(Archiver& arc)
{
Trigger::Archive(arc);
arc.ArchiveString(&m_sSaveName);
@ -288,10 +275,7 @@ class TriggerPush : public Trigger
void Archive(Archiver& arc) override;
};
inline void TriggerPush::Archive
(
Archiver &arc
)
inline void TriggerPush::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -312,10 +296,7 @@ class TriggerPushAny : public Trigger
void Archive(Archiver& arc) override;
};
inline void TriggerPushAny::Archive
(
Archiver &arc
)
inline void TriggerPushAny::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -353,10 +334,7 @@ class TriggerPlaySound : public Trigger
void Archive(Archiver& arc) override;
};
inline void TriggerPlaySound::Archive
(
Archiver &arc
)
inline void TriggerPlaySound::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -365,13 +343,11 @@ inline void TriggerPlaySound::Archive
arc.ArchiveFloat(&volume);
arc.ArchiveInteger(&channel);
arc.ArchiveBoolean(&ambient);
if ( arc.Loading() )
{
if (arc.Loading()) {
//
// see if its a toggle sound, if it is, lets start its sound again
//
if ( spawnflags & TOGGLESOUND )
{
if (spawnflags & TOGGLESOUND) {
//
// invert state so that final state will be right
//
@ -415,10 +391,7 @@ class RandomSpeaker : public TriggerSpeaker
void Archive(Archiver& arc) override;
};
inline void RandomSpeaker::Archive
(
Archiver &arc
)
inline void RandomSpeaker::Archive(Archiver& arc)
{
TriggerSpeaker::Archive(arc);
@ -455,7 +428,6 @@ class TriggerExit : public Trigger
void TurnExitSignOff(Event *ev);
};
class TriggerUse : public Trigger
{
public:
@ -487,10 +459,7 @@ class TriggerHurt : public TriggerUse
void Archive(Archiver& arc) override;
};
inline void TriggerHurt::Archive
(
Archiver &arc
)
inline void TriggerHurt::Archive(Archiver& arc)
{
TriggerUse::Archive(arc);
@ -513,10 +482,7 @@ class TriggerDamageTargets : public Trigger
void Archive(Archiver& arc) override;
};
inline void TriggerDamageTargets::Archive
(
Archiver &arc
)
inline void TriggerDamageTargets::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -551,6 +517,7 @@ class TriggerMusic : public Trigger
str fallback;
str altcurrent;
str altfallback;
public:
CLASS_PROTOTYPE(TriggerMusic);
@ -570,10 +537,7 @@ class TriggerMusic : public Trigger
void Archive(Archiver& arc) override;
};
inline void TriggerMusic::Archive
(
Archiver &arc
)
inline void TriggerMusic::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -595,6 +559,7 @@ class TriggerReverb : public Trigger
int altreverbtype;
float reverblevel;
float altreverblevel;
public:
CLASS_PROTOTYPE(TriggerReverb);
@ -614,10 +579,7 @@ class TriggerReverb : public Trigger
void Archive(Archiver& arc) override;
};
inline void TriggerReverb::Archive
(
Archiver &arc
)
inline void TriggerReverb::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -645,10 +607,7 @@ class TriggerByPushObject : public TriggerOnce
void Archive(Archiver& arc) override;
};
inline void TriggerByPushObject::Archive
(
Archiver &arc
)
inline void TriggerByPushObject::Archive(Archiver& arc)
{
TriggerOnce::Archive(arc);
@ -661,6 +620,7 @@ class TriggerGivePowerup : public Trigger
private:
qboolean oneshot;
str powerup_name;
public:
CLASS_PROTOTYPE(TriggerGivePowerup);
@ -671,10 +631,7 @@ class TriggerGivePowerup : public Trigger
void Archive(Archiver& arc) override;
};
inline void TriggerGivePowerup::Archive
(
Archiver &arc
)
inline void TriggerGivePowerup::Archive(Archiver& arc)
{
Trigger::Archive(arc);
@ -693,15 +650,13 @@ public:
void Archive(Archiver& arc) override;
};
inline void TriggerClickItem::Archive
(
Archiver &arc
)
inline void TriggerClickItem::Archive(Archiver& arc)
{
Trigger::Archive(arc);
}
class TriggerNoDamage : public TriggerUse {
class TriggerNoDamage : public TriggerUse
{
public:
CLASS_PROTOTYPE(TriggerNoDamage);
@ -709,12 +664,14 @@ public:
void TakeNoDamage(Event *ev);
};
class TriggerEntity : public Trigger {
class TriggerEntity : public Trigger
{
public:
CLASS_PROTOTYPE(TriggerEntity);
};
class TriggerLandmine : public TriggerEntity {
class TriggerLandmine : public TriggerEntity
{
public:
CLASS_PROTOTYPE(TriggerLandmine);