ubergames/ef2gamesource
0
0
Fork 0
mirror of https://github.com/UberGames/EF2GameSource.git synced 2024-11-27 05:32:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update of Actor

Browse source
This commit is contained in:
Walter Julius Hennecke 2015-04-28 22:02:03 +02:00
parent b5cf2b6c8b
commit 60aa3b8bc4
7 changed files with 14523 additions and 16021 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29491
dlls/game/actor.cpp
View file

File diff suppressed because it is too large Load diff

172
dlls/game/actor.h
View file

@ -28,20 +28,17 @@ class FindEnemyMovement;
#ifndef __ACTOR_H__
#define __ACTOR_H__
#include <cinttypes>
#include "g_local.h"
#include "weapon.h"
#include "sentient.h"
#include "container.h"
#include "stack.h"
#include "navigate.h"
#include "behavior.h"
#include "behaviors_general.h"
#include "behaviors_specific.h"
#include "scriptmaster.h"
#include "characterstate.h"
#include "actorstrategies.h"
#include "actorgamecomponents.h"
#include "helper_node.h"
#include "actorutil.h"
#include "actor_sensoryperception.h"
#include "actor_enemymanager.h"
@ -51,7 +48,6 @@ class FindEnemyMovement;
#include "actor_posturecontroller.hpp"
#include "actorincludes.h"
#include "RageAI.h"
#include "FollowPath.h"
//-------------------------------------------
// Global Functions
@ -123,14 +119,14 @@ class Actor : public Sentient {
// of just BONE.
//-----------------------------------------------------
str newanim;
int newanimnum;
int animnum;
int32_t newanimnum;
int32_t animnum;
str animname;
Event* newanimevent;
str last_anim_event_name;
str newTorsoAnim;
int newTorsoAnimNum;
int32_t newTorsoAnimNum;
str TorsoAnimName;
Event* newTorsoAnimEvent;
str last_torso_anim_event_name;
@ -241,12 +237,12 @@ class Actor : public Sentient {
// should experiment with converting these flags into a
// bit vector
//---------------------------------------------------------
unsigned int actor_flags1;
unsigned int actor_flags2;
unsigned int actor_flags3;
unsigned int actor_flags4;
unsigned int notify_flags1;
unsigned int state_flags;
uint32_t actor_flags1;
uint32_t actor_flags2;
uint32_t actor_flags3;
uint32_t actor_flags4;
uint32_t notify_flags1;
uint32_t state_flags;
//--------------------------------------------------------
@ -301,9 +297,9 @@ class Actor : public Sentient {
float pain_threshold;
float next_drown_time;
float air_finished;
int pain_type;
int32_t pain_type;
Vector pain_angles;
int bullet_hits;
int32_t bullet_hits;
float next_pain_time;
float min_pain_time;
float next_forced_pain_time;
@ -334,8 +330,8 @@ class Actor : public Sentient {
float state_time;
float masterstate_time;
int times_done;
int masterstate_times_done;
int32_t times_done;
int32_t masterstate_times_done;
float state_done_time;
float masterstate_done_time;
float last_time_active;
@ -390,7 +386,7 @@ class Actor : public Sentient {
// to talk, when the dialog is completed, they step back into
// the behaivors they saved off here
//---------------------------------------------------------------
int saved_mode;
int32_t saved_mode;
BehaviorPtr saved_behavior;
BehaviorPtr saved_headBehavior;
BehaviorPtr saved_eyeBehavior;
@ -438,14 +434,14 @@ class Actor : public Sentient {
EntityPtr last_ent;
float canseeenemy_time;
float canseeplayer_time;
int stage;
int num_of_spawns;
int32_t stage;
int32_t num_of_spawns;
ActorPtr spawnparent;
Vector last_attack_pos;
Vector last_attack_enemy_pos;
EntityPtr last_attack_entity_hit;
Vector last_attack_entity_hit_pos;
int mode;
int32_t mode;
Vector last_known_enemy_pos;
Vector last_known_player_pos;
float feet_width;
@ -461,10 +457,10 @@ class Actor : public Sentient {
float actor_to_actor_damage_modifier;
float last_used_time;
float hitscan_response_chance;
int shotsFired;
int ondamage_threshold;
int32_t shotsFired;
int32_t ondamage_threshold;
float timeBetweenSleepChecks;
int saved_bone_hit;
int32_t saved_bone_hit;
float activationDelay;
float activationStart;
float deathKnockbackVerticalValue;
@ -515,7 +511,7 @@ class Actor : public Sentient {
// target.
//--------------------------------------------------------
FollowTargetData_t followTarget;
int _steeringDirectionPreference;
int32_t _steeringDirectionPreference;
@ -537,7 +533,7 @@ class Actor : public Sentient {
float spawn_chance;
str bounce_off_effect;
float bounce_off_velocity;
Container<int> can_be_finsihed_by_mods;
Container<int32_t> can_be_finsihed_by_mods;
float max_boss_health;
qboolean haveAttached;
float currentSplineTime;
@ -592,21 +588,21 @@ class Actor : public Sentient {
Actor();
~Actor();
void Start(Event* ev);
void Sleep(void);
void Sleep();
void Sleep(Event* ev);
void Wakeup(void);
void Wakeup();
void Wakeup(Event* ev);
void InitGameComponent(void);
void InitThinkStrategy(void);
void InitSensoryPerception(void);
void InitStrategos(void);
void InitEnemyManager(void);
void InitPackageManager(void);
void InitMovementSubsystem(void);
void InitPersonality(void);
void InitCombatSubsystem(void);
void InitHeadWatcher(void);
void InitPostureController(void);
void InitGameComponent();
void InitThinkStrategy();
void InitSensoryPerception();
void InitStrategos();
void InitEnemyManager();
void InitPackageManager();
void InitMovementSubsystem();
void InitPersonality();
void InitCombatSubsystem();
void InitHeadWatcher();
void InitPostureController();
//---------------------------------------------------------
// Event Interface for Accessor Functions
@ -641,15 +637,14 @@ class Actor : public Sentient {
void SetNotAllowedToKill(Event* ev);
void SetUseGravity(Event* ev);
void SetAllowFall(Event* ev);
void SetUseMovement(Event* ev);
void SetHaveThing(Event* ev);
void SetHaveThing(int thing_number, qboolean thing_bool);
void SetHaveThing(int32_t thing_number, qboolean thing_bool);
void SetBounceOff(Event* ev);
void SetBounceOffEffect(Event* ev);
void SetMaxInactiveTime(Event* ev);
void SetTurnSpeed(Event* ev);
void SetHealth(Event* ev);
void SetMaxHealth(Event* ev);
virtual void SetHealth(Event* ev) override;
virtual void SetMaxHealth(Event* ev) override;
void SetVar(Event* ev);
void SetVarTime(Event* ev);
void SetMask(Event* ev);
@ -697,7 +692,6 @@ class Actor : public Sentient {
void SetHeadWatchTarget(Entity *ent);
void SetHeadWatchSpeed(float speed);
void ResetTorso(Event* ev);
void EyeOffset(Event* ev);
void ForceSetClip(Event* ev);
void GroupMemberInjured(Event* ev);
@ -714,8 +708,6 @@ class Actor : public Sentient {
void SetMaxHeadYaw(Event* ev);
void SetMaxHeadPitch(Event* ev);
void SetPlayerHateModifier(Event* ev);
void UseBehaviorPackage(Event* ev);
void UseBehaviorPackage(const str& packageName);
@ -742,7 +734,7 @@ class Actor : public Sentient {
void SetTalkWatchMode(Event* ev);
void SetPostureState(Event* ev);
/*virtual*/ void processGameplayData(Event* ev);
virtual void processGameplayData(Event* ev) override;
void UnreserveCurrentHelperNode(Event* ev);
void UnreserveCurrentHelperNode();
@ -754,7 +746,7 @@ class Actor : public Sentient {
void AddCustomThread(const str& threadType, const str& threadName);
bool HaveCustomThread(const str& threadType);
void RunCustomThread(const str& threadType);
const str GetCustomThread(const str& threadType);
str GetCustomThread(const str& threadType);
//----------------------------------------------------------
// Personality Tendencies
@ -779,7 +771,7 @@ class Actor : public Sentient {
// Debug Functions
//-----------------------------------------------------------
void DebugStates(Event* ev);
void ShowInfo(void);
void ShowInfo();
void WhatAreYouDoing(Event* ev);
void WhatsWrong(Event* ev);
void PrintMasterStateInfo();
@ -818,11 +810,11 @@ class Actor : public Sentient {
void TurnTowardsEntity(Event* ev);
void SetMinimumMeleeHeight(Event* ev);
qboolean IsImmortal(void);
qboolean TakeDamage(void);
qboolean IsImmortal();
qboolean TakeDamage();
void FireWeapon(Event* ev);
void StopFireWeapon(Event* ev);
virtual void FireWeapon(Event* ev) override;
virtual void StopFireWeapon(Event* ev) override;
void ClearArmorAdaptions(Event* ev);
//-----------------------------------------------------------------
@ -849,15 +841,15 @@ class Actor : public Sentient {
//--------------------------------------------------------------
void SetIdleStateName(Event* ev);
void SetState(const char* state_name);
void resetStateMachine(void);
void resetStateMachine();
void SetMasterState(const str& state_name);
void SetGlobalState(const char* state_name);
void InitState(void);
void InitMasterState(void);
void InitState();
void InitMasterState();
void LoadStateMap(Event* ev);
void LoadMasterStateMap(Event* ev);
void ProcessActorStateMachine(void);
void ProcessMasterStateMachine(void);
void ProcessActorStateMachine();
void ProcessMasterStateMachine();
void LoadFuzzyEngine(Event* ev);
void LoadPostureStateMachine(Event* ev);
@ -867,22 +859,21 @@ class Actor : public Sentient {
//--------------------------------------------------------------
void RunThread(Event* ev);
void RunThread(const str& thread_name);
void SetThread(const str& filename, const str& label);
void RunDamageThread(void);
void RunDamageThread();
void RunAlertThread(Event* ev);
//--------------------------------------------------------------
// Behavior management
//--------------------------------------------------------------
void SendMoveDone(CThread* script_thread);
void EndBehavior(void);
void EndHeadBehavior(void);
void EndEyeBehavior(void);
void EndTorsoBehavior(void);
void SetBehavior(Behavior* newbehavior, Event* argevent = NULL, CThread* thread = NULL);
void SetHeadBehavior(Behavior* newbehavior, Event* argevent = NULL, CThread* thread = NULL);
void SetEyeBehavior(Behavior* newbehavior, Event* argevent = NULL, CThread* thread = NULL);
void SetTorsoBehavior(Behavior* newbehavior, Event* argevent = NULL, CThread* thread = NULL);
void EndBehavior();
void EndHeadBehavior();
void EndEyeBehavior();
void EndTorsoBehavior();
void SetBehavior(Behavior* newbehavior, Event* argevent = nullptr, CThread* thread = nullptr);
void SetHeadBehavior(Behavior* newbehavior, Event* argevent = nullptr, CThread* thread = nullptr);
void SetEyeBehavior(Behavior* newbehavior, Event* argevent = nullptr, CThread* thread = nullptr);
void SetTorsoBehavior(Behavior* newbehavior, Event* argevent = nullptr, CThread* thread = nullptr);
void EndBehaviorEvent(Event* ev);
void EndHeadBehaviorEvent(Event* ev);
void EndEyeBehaviorEvent(Event* ev);
@ -891,7 +882,7 @@ class Actor : public Sentient {
void NotifyHeadBehavior(Event* ev);
void NotifyEyeBehavior(Event* ev);
void NotifyTorsoBehavior(Event* ev);
void EndAllBehaviors(void);
void EndAllBehaviors();
//-----------------------------------------------------------------
@ -905,21 +896,21 @@ class Actor : public Sentient {
trace_t Trace(const float distance, const char* reason) const;
trace_t Trace(const float angle, const float distance, const char* reason) const;
trace_t Trace(const Vector& begin, const Vector& end, const char* reason) const;
trace_t Trace(const Vector& begin, const Vector& end, const int contentMask, const char* reason) const;
trace_t Trace(const Vector& begin, const Vector& end, const int32_t contentMask, const char* reason) const;
//-----------------------------------------------------------------
// Animation control functions
//-----------------------------------------------------------------
void RemoveAnimDoneEvent(void);
void ChangeAnim(void);
qboolean SetAnim(const str& anim, Event* ev = NULL, bodypart_t part = legs, const float animationRate = 1.0f);
void RemoveAnimDoneEvent();
void ChangeAnim();
qboolean SetAnim(const str& anim, Event* ev = nullptr, bodypart_t part = legs, const float animationRate = 1.0f);
qboolean SetAnim(const str& anim, Event& ev, bodypart_t part = legs, const float animationRate = 1.0f);
void SetAnim(Event* ev);
void AnimDone(Event* ev);
void TorsoAnimDone(Event* ev);
void SetCinematicAnim(const str& anim);
void CinematicAnimDone();
virtual void SetCinematicAnim(const str& anim) override;
virtual void CinematicAnimDone() override;
void PostureAnimDone(Event* ev);
//-----------------------------------------------------------------
@ -1055,14 +1046,13 @@ class Actor : public Sentient {
void StopDialog(Event* ev);
void PlayRadiusDialog(Sentient *user);
void StopDialog(void);
void PlayDialog(Sentient* user, float volume = -1.0f, float min_dist = -1.0f, const char* dialog_name = NULL, const char* state_name = NULL, qboolean headDisplay = false, bool useTalk = false, bool important = false);
void PlayDialog(Sentient* user, float volume = -1.0f, float min_dist = -1.0f, const char* dialog_name = nullptr, const char* state_name = nullptr, qboolean headDisplay = false, bool useTalk = false, bool important = false);
qboolean DialogExists(const str& aliasName);
float GetDialogRemainingTime(void);
const str FindDialog(Sentient* user, DialogType_t dialogType, const str& context = "");
str FindDialog(Sentient* user, DialogType_t dialogType, const str& context = "");
void BranchDialog(Event* ev);
void BranchOptionSelected(Event* ev);
//-----------------------------------------------------------------
// Branch Dialog Functionality
@ -1119,7 +1109,7 @@ class Actor : public Sentient {
bool ReleaseControl(Listener* controller);
const str GetStateVar(const str& varName);
str GetStateVar(const str& varName);
//-----------------------------------------------------------------
// General functions
@ -1140,7 +1130,7 @@ class Actor : public Sentient {
void SetActorFlag(const str& flag_name, qboolean flag_value);
void SetStickToGround(const bool stick);
void SetStickToGround(Event* ev);
const bool GetStickToGround(void) const;
bool GetStickToGround(void) const;
void SetActorFlag(int flag, qboolean flag_value);
void SetActorFlag(Event* ev);
qboolean GetActorFlag(const int flag) const;
@ -1158,12 +1148,12 @@ class Actor : public Sentient {
void GetStage(Event* ev);
void Pickup(Event* ev);
void Throw(Event* ev);
virtual void setSize(Vector min, Vector max);
virtual void setSize(Vector min, Vector max) override;
void NoChatterEvent(Event* ev);
virtual void Chatter(const char* sound, float chance = 10, float volume = 1.0f, int channel = CHAN_VOICE);
void ActivateEvent(Event* ev);
void UseEvent(Event* ev);
void Think(void);
virtual void Think() override;
void Active(Event* ev);
bool IsEntityAlive(const Entity *ent);
void Name(Event* ev);
@ -1184,12 +1174,12 @@ class Actor : public Sentient {
void NotSolidMask(Event* ev);
void NoMask(Event* ev);
void ResetMoveDir(Event* ev);
int ActorFlag_string_to_int(const str& actorflagstr) const;
int NotifyFlag_string_to_int(const str& notifyflagstr);
void ArmorDamage(Event* ev);
int32_t ActorFlag_string_to_int(const str& actorflagstr) const;
int32_t NotifyFlag_string_to_int(const str& notifyflagstr);
virtual void ArmorDamage(Event* ev) override;
qboolean CheckBottom(void);
void ChangeType(Event* ev);
void GetStateAnims(Container<const char*>* c);
virtual void GetStateAnims(Container<const char*>* c) override;
void Touched(Event* ev);
void TryBlink(void);
void SetBlink(Event* ev);
@ -1374,12 +1364,10 @@ class Actor : public Sentient {
qboolean checkIsTeammate(Conditional& condition);
qboolean checkWeaponIsMelee(Conditional& condition);
qboolean checkWeaponChanged(Conditional& condition);
qboolean checkPersonality(Conditional& condition);
qboolean checkVarTimeDifference(Conditional& condition);
qboolean checkRequestedPosture(Conditional& condition);
qboolean checkPostureAnimDone(Conditional& condition);
qboolean checkCurrentEnemyLastInList(Conditional& condition);
qboolean checkGroupAttackerCount(Conditional& condition);
qboolean checkCurrentEnemyGroupAttackerCount(Conditional& condition);
qboolean checkGroupAttackerCountForEntity(Conditional& condition, Entity* attackTarget);
@ -1505,7 +1493,7 @@ class Actor : public Sentient {
qboolean checkInAIMode(Conditional& condition);
virtual void Archive(Archiver& arc);
virtual void Archive(Archiver& arc) override;
protected:
@ -1519,6 +1507,8 @@ class Actor : public Sentient {
qboolean _WorkNodeInDistance(float dist);
qboolean _FleeNodeInDistance(float dist);
void Init();
};
typedef PathFinder<FindMovement> FindMovementPath;

51
dlls/game/characterstate.cpp
View file

@ -67,6 +67,57 @@ Conditional::Conditional( const Condition<Class> &cond ) :
checked = false;
}
const char* Conditional::getParm(int number)
{
if (number < 1 || number > parmList.NumObjects())
{
gi.Error(ERR_DROP, "Parm #%d out of range on %s condition\n", number, condition.name);
}
return parmList.ObjectAt(number).c_str();
}
template <>
float Conditional::getParm(int number)
{
return float(atof(getParm(number)));
}
template<>
int Conditional::getParm(int number)
{
return atoi(getParm(number));
}
bool Conditional::getResult(testcondition_t test, Entity& ent)
{
if (condition.func && !checked)
{
checked = true;
previous_result = result;
result = (ent.*condition.func)(*this);
}
switch (test)
{
case TC_ISFALSE:
return !result;
break;
case TC_EDGETRUE:
return result && !previous_result;
break;
case TC_EDGEFALSE:
return !result && previous_result;
break;
case TC_ISTRUE:
default:
return result != false;
}
}
Conditional::Conditional( void )
{
gi.Error( ERR_DROP, "Conditional created with wrong constructor\n" );

783
dlls/game/characterstate.h
View file

@ -25,50 +25,50 @@
#include "script.h"
enum testcondition_t
{
TC_ISTRUE, // no prefix
TC_ISFALSE, // !
TC_EDGETRUE, // +
TC_EDGEFALSE // -
};
{
TC_ISTRUE, // no prefix
TC_ISFALSE, // !
TC_EDGETRUE, // +
TC_EDGEFALSE // -
};
enum movecontrol_t
{
MOVECONTROL_USER, // Quake style
MOVECONTROL_LEGS, // Quake style, legs state system active
MOVECONTROL_ANIM, // move based on animation, with full collision testing
MOVECONTROL_ABSOLUTE, // move based on animation, with full collision testing but no turning
MOVECONTROL_HANGING, // move based on animation, with full collision testing, hanging
MOVECONTROL_WALLHUG, // move based on animation, with full collision testing, hanging
MOVECONTROL_MONKEYBARS, // move based on animation, with full collision testing, monkey bars
MOVECONTROL_PIPECRAWL, // move based on animation, with full collision testing, crawling on pipe
MOVECONTROL_PIPEHANG, // move based on animation, with full collision testing, hanging from pipe
MOVECONTROL_STEPUP,
MOVECONTROL_ROPE_GRAB,
MOVECONTROL_ROPE_RELEASE,
MOVECONTROL_ROPE_MOVE,
MOVECONTROL_PICKUPENEMY,
MOVECONTROL_PUSH,
MOVECONTROL_CLIMBWALL,
MOVECONTROL_USEANIM,
MOVECONTROL_CROUCH,
MOVECONTROL_LOOPUSEANIM,
MOVECONTROL_USEOBJECT,
MOVECONTROL_COOLOBJECT,
MOVECONTROL_FAKEPLAYER
};
{
MOVECONTROL_USER, // Quake style
MOVECONTROL_LEGS, // Quake style, legs state system active
MOVECONTROL_ANIM, // move based on animation, with full collision testing
MOVECONTROL_ABSOLUTE, // move based on animation, with full collision testing but no turning
MOVECONTROL_HANGING, // move based on animation, with full collision testing, hanging
MOVECONTROL_WALLHUG, // move based on animation, with full collision testing, hanging
MOVECONTROL_MONKEYBARS, // move based on animation, with full collision testing, monkey bars
MOVECONTROL_PIPECRAWL, // move based on animation, with full collision testing, crawling on pipe
MOVECONTROL_PIPEHANG, // move based on animation, with full collision testing, hanging from pipe
MOVECONTROL_STEPUP,
MOVECONTROL_ROPE_GRAB,
MOVECONTROL_ROPE_RELEASE,
MOVECONTROL_ROPE_MOVE,
MOVECONTROL_PICKUPENEMY,
MOVECONTROL_PUSH,
MOVECONTROL_CLIMBWALL,
MOVECONTROL_USEANIM,
MOVECONTROL_CROUCH,
MOVECONTROL_LOOPUSEANIM,
MOVECONTROL_USEOBJECT,
MOVECONTROL_COOLOBJECT,
MOVECONTROL_FAKEPLAYER
};
enum cameratype_t
{
CAMERA_TOPDOWN,
CAMERA_BEHIND,
CAMERA_FRONT,
CAMERA_SIDE,
CAMERA_BEHIND_FIXED,
CAMERA_SIDE_LEFT,
CAMERA_SIDE_RIGHT,
CAMERA_BEHIND_NOPITCH
};
{
CAMERA_TOPDOWN,
CAMERA_BEHIND,
CAMERA_FRONT,
CAMERA_SIDE,
CAMERA_BEHIND_FIXED,
CAMERA_SIDE_LEFT,
CAMERA_SIDE_RIGHT,
CAMERA_BEHIND_NOPITCH
};
#define DEFAULT_MOVETYPE MOVECONTROL_LEGS
#define DEFAULT_CAMERA CAMERA_BEHIND
@ -77,459 +77,388 @@ class Conditional;
template< class Type >
struct Condition
{
const char *name;
qboolean ( Type::*func )( Conditional &condition );
};
{
const char *name;
qboolean(Type::*func)(Conditional &condition);
};
class Conditional : public Class
{
private :
qboolean result;
qboolean previous_result;
bool checked;
{
qboolean result;
qboolean previous_result;
bool checked;
public :
Condition<Class> condition;
Container<str> parmList;
public:
Condition<Class> condition;
Container<str> parmList;
bool getResult( testcondition_t test, Entity &ent );
const char *getName( void );
bool getResult(testcondition_t test, Entity &ent);
Conditional( void );
Conditional( const Condition<Class> &condition );
const char* getName(void)
{
return condition.name;
}
const char *getParm( int number );
void addParm( const str &parm );
int numParms( void );
void clearCheck( void );
};
Conditional();
explicit Conditional(const Condition<Class> &condition);
inline void Conditional::addParm
(
const str &parm
)
const char* getParm(int number);
{
parmList.AddObject( parm );
}
template <typename A>
A getParm(int number);
inline const char *Conditional::getParm
(
int number
)
void addParm(const str &parm)
{
parmList.AddObject(parm);
}
{
if ( ( number < 1 ) || ( number > parmList.NumObjects() ) )
{
gi.Error( ERR_DROP, "Parm #%d out of range on %s condition\n", number, condition.name );
}
return parmList.ObjectAt( number ).c_str();
}
inline int Conditional::numParms
(
void
)
{
return parmList.NumObjects();
}
inline void Conditional::clearCheck
(
void
)
{
checked = false;
}
inline const char *Conditional::getName
(
void
)
{
return condition.name;
}
inline bool Conditional::getResult
(
testcondition_t test,
Entity &ent
)
{
if ( condition.func && !checked )
{
checked = true;
previous_result = result;
result = ( ent.*condition.func )( (Conditional&)*this );
}
switch( test )
{
case TC_ISFALSE :
return !result;
break;
case TC_EDGETRUE :
return result && !previous_result;
break;
case TC_EDGEFALSE :
return !result && previous_result;
break;
case TC_ISTRUE :
default :
return result != false;
}
}
int numParms(void)
{
return parmList.NumObjects();
}
void clearCheck(void)
{
checked = false;
}
};
class State;
class StateMap;
class FuzzyVar;
class Expression : public Class
{
private :
struct condition_t
{
testcondition_t test;
int condition_index;
};
{
struct condition_t
{
testcondition_t test;
int condition_index;
};
str value;
Container<condition_t> conditions;
// For Fuzzy Vars
float points;
str value;
Container<condition_t> conditions;
public :
Expression();
Expression( const Expression &exp );
Expression( Script &script, State &state );
Expression( Script &script, FuzzyVar &fuzzyVar );
// For Fuzzy Vars
float points;
void operator=( const Expression &exp );
public:
Expression();
Expression(const Expression &exp);
Expression(Script &script, State &state);
Expression(Script &script, FuzzyVar &fuzzyVar);
bool getResult( const State &state, Entity &ent, const Container<Conditional *> *sent_conditionals );
bool getResult( const FuzzyVar &fVar, Entity &ent, const Container<Conditional *> *sent_conditionals );
const char *getValue( void );
void operator=(const Expression &exp);
// For Fuzzy Vars
float getPoints();
};
bool getResult(const State &state, Entity &ent, const Container<Conditional *> *sent_conditionals);
bool getResult(const FuzzyVar &fVar, Entity &ent, const Container<Conditional *> *sent_conditionals);
const char *getValue(void);
// For Fuzzy Vars
float getPoints();
};
inline void Expression::operator=
(
const Expression &exp
)
(
const Expression &exp
)
{
int i;
Expression *temp_exp = (Expression *)&exp; // This is here to get around some const issues
{
int i;
auto temp_exp = &exp; // This is here to get around some const issues
value = exp.value;
points = exp.points;
value = exp.value;
points = exp.points;
conditions.FreeObjectList();
for( i = 1; i <= temp_exp->conditions.NumObjects(); i++ )
{
conditions.AddObject( temp_exp->conditions.ObjectAt( i ) );
}
}
conditions.FreeObjectList();
for (i = 1; i <= temp_exp->conditions.NumObjects(); i++)
{
conditions.AddObject(temp_exp->conditions.ObjectAt(i));
}
}
inline const char *Expression::getValue
(
void
)
(
void
)
{
return value.c_str();
}
{
return value.c_str();
}
inline float Expression::getPoints()
{
return points;
}
{
return points;
}
class State : public Class
{
private :
Container<int> condition_indexes;
{
Container<int> condition_indexes;
StateMap &statemap;
StateMap &statemap;
str name;
str name;
str nextState;
movecontrol_t movetype;
cameratype_t cameratype;
str nextState;
movecontrol_t movetype;
cameratype_t cameratype;
str behaviorName;
Container<str> behaviorParmList;
str behaviorName;
Container<str> behaviorParmList;
str headBehaviorName;
Container<str> headBehaviorParmList;
str headBehaviorName;
Container<str> headBehaviorParmList;
str eyeBehaviorName;
Container<str> eyeBehaviorParmList;
str eyeBehaviorName;
Container<str> eyeBehaviorParmList;
str torsoBehaviorName;
Container<str> torsoBehaviorParmList;
str torsoBehaviorName;
Container<str> torsoBehaviorParmList;
float minTime;
float maxTime;
float minTime;
float maxTime;
Container<Expression> legAnims;
Container<Expression> torsoAnims;
Container<Expression> legAnims;
Container<Expression> torsoAnims;
Container<Expression> states;
Container<str> entryCommands;
Container<str> exitCommands;
qboolean ignoreGlobalStates;
Container<Expression> states;
Container<str> entryCommands;
Container<str> exitCommands;
void readNextState( Script &script );
void readMoveType( Script &script );
void readCamera( Script &script );
void readLegs( Script &script );
void readTorso( Script &script );
void readBehavior( Script &script );
void readHeadBehavior( Script &script );
void readEyeBehavior( Script &script );
void readTorsoBehavior( Script &script );
void readTime( Script &script );
void readStates( Script &script );
void readCommands( Script &script, Container<str> &container );
qboolean ignoreGlobalStates;
void ParseAndProcessCommand( const str &command, Entity *target );
void readNextState(Script &script);
void readMoveType(Script &script);
void readCamera(Script &script);
void readLegs(Script &script);
void readTorso(Script &script);
void readBehavior(Script &script);
void readHeadBehavior(Script &script);
void readEyeBehavior(Script &script);
void readTorsoBehavior(Script &script);
void readTime(Script &script);
void readStates(Script &script);
void readCommands(Script &script, Container<str> &container);
public :
State( const char *name, Script &script, StateMap &map );
void ParseAndProcessCommand(const str &command, Entity *target);
State *Evaluate( Entity &ent, Container<Conditional *> *ent_conditionals );
int addCondition( const char *name, Script &script );
void CheckStates( void );
public:
State(const char *name, Script &script, StateMap &map);
const char *getName( void );
State *Evaluate(Entity &ent, Container<Conditional *> *ent_conditionals);
int addCondition(const char *name, Script &script);
void CheckStates(void);
const char *getLegAnim( Entity &ent, Container<Conditional *> *sent_conditionals );
const char *getTorsoAnim( Entity &ent, Container<Conditional *> *sent_conditionals );
const char *getBehaviorName( void );
const char *getHeadBehaviorName( void );
const char *getEyeBehaviorName( void );
const char *getTorsoBehaviorName( void );
State *getNextState( void );
movecontrol_t getMoveType( void );
cameratype_t getCameraType( void );
qboolean setCameraType( const str &ctype );
const char *getName(void);
const char *getBehaviorParm( int number=1 );
const char *getHeadBehaviorParm( int number=1 );
const char *getEyeBehaviorParm( int number=1 );
const char *getTorsoBehaviorParm( int number=1 );
void addBehaviorParm( const str &parm );
void addHeadBehaviorParm( const str &parm );
void addEyeBehaviorParm( const str &parm );
void addTorsoBehaviorParm( const str &parm );
int numBehaviorParms( void );
int numHeadBehaviorParms( void );
int numEyeBehaviorParms( void );
int numTorsoBehaviorParms( void );
const char *getLegAnim(Entity &ent, Container<Conditional *> *sent_conditionals);
const char *getTorsoAnim(Entity &ent, Container<Conditional *> *sent_conditionals);
const char *getBehaviorName(void);
const char *getHeadBehaviorName(void);
const char *getEyeBehaviorName(void);
const char *getTorsoBehaviorName(void);
State *getNextState(void);
movecontrol_t getMoveType(void);
cameratype_t getCameraType(void);
qboolean setCameraType(const str &ctype);
float getMinTime( void );
float getMaxTime( void );
void ProcessEntryCommands( Entity *target );
void ProcessExitCommands( Entity *target );
void GetLegAnims( Container<const char *> *c );
void GetTorsoAnims( Container<const char *> *c );
qboolean IgnoreGlobalStates();
};
const char *getBehaviorParm(int number = 1);
const char *getHeadBehaviorParm(int number = 1);
const char *getEyeBehaviorParm(int number = 1);
const char *getTorsoBehaviorParm(int number = 1);
void addBehaviorParm(const str &parm);
void addHeadBehaviorParm(const str &parm);
void addEyeBehaviorParm(const str &parm);
void addTorsoBehaviorParm(const str &parm);
int numBehaviorParms(void);
int numHeadBehaviorParms(void);
int numEyeBehaviorParms(void);
int numTorsoBehaviorParms(void);
float getMinTime(void);
float getMaxTime(void);
void ProcessEntryCommands(Entity *target);
void ProcessExitCommands(Entity *target);
void GetLegAnims(Container<const char *> *c);
void GetTorsoAnims(Container<const char *> *c);
qboolean IgnoreGlobalStates();
};
inline void State::addBehaviorParm
(
const str &parm
)
(
const str &parm
)
{
behaviorParmList.AddObject( parm );
}
{
behaviorParmList.AddObject(parm);
}
inline void State::addHeadBehaviorParm
(
const str &parm
)
(
const str &parm
)
{
headBehaviorParmList.AddObject( parm );
}
{
headBehaviorParmList.AddObject(parm);
}
inline void State::addEyeBehaviorParm
(
const str &parm
)
(
const str &parm
)
{
eyeBehaviorParmList.AddObject( parm );
}
{
eyeBehaviorParmList.AddObject(parm);
}
inline void State::addTorsoBehaviorParm
(
const str &parm
)
(
const str &parm
)
{
torsoBehaviorParmList.AddObject( parm );
}
{
torsoBehaviorParmList.AddObject(parm);
}
inline const char *State::getBehaviorParm
(
int number
)
(
int number
)
{
return behaviorParmList.ObjectAt( number ).c_str();
}
{
return behaviorParmList.ObjectAt(number).c_str();
}
inline const char *State::getHeadBehaviorParm
(
int number
)
(
int number
)
{
return headBehaviorParmList.ObjectAt( number ).c_str();
}
{
return headBehaviorParmList.ObjectAt(number).c_str();
}
inline const char *State::getEyeBehaviorParm
(
int number
)
(
int number
)
{
return eyeBehaviorParmList.ObjectAt( number ).c_str();
}
{
return eyeBehaviorParmList.ObjectAt(number).c_str();
}
inline const char *State::getTorsoBehaviorParm
(
int number
)
(
int number
)
{
return torsoBehaviorParmList.ObjectAt( number ).c_str();
}
{
return torsoBehaviorParmList.ObjectAt(number).c_str();
}
inline int State::numBehaviorParms
(
void
)
(
void
)
{
return behaviorParmList.NumObjects();
}
{
return behaviorParmList.NumObjects();
}
inline int State::numHeadBehaviorParms
(
void
)
inline int State::numHeadBehaviorParms
(
void
)
{
return headBehaviorParmList.NumObjects();
}
{
return headBehaviorParmList.NumObjects();
}
inline int State::numEyeBehaviorParms
(
void
)
(
void
)
{
return eyeBehaviorParmList.NumObjects();
}
{
return eyeBehaviorParmList.NumObjects();
}
inline int State::numTorsoBehaviorParms
(
void
)
(
void
)
{
return torsoBehaviorParmList.NumObjects();
}
{
return torsoBehaviorParmList.NumObjects();
}
class StateMap : public Class
{
private :
Container<State *> stateList;
Container<State *> globalStateList;
Condition<Class> *current_conditions;
Container<Conditional *> *current_conditionals;
str filename;
{
Container<State *> stateList;
Container<State *> globalStateList;
Condition<Class> *current_conditions;
Container<Conditional *> *current_conditionals;
str filename;
public :
StateMap();
StateMap( const char *filename, Condition<Class> *conditions, Container<Conditional *> *conditionals );
~StateMap();
public:
StateMap();
StateMap(const char *filename, Condition<Class> *conditions, Container<Conditional *> *conditionals);
~StateMap();
Condition<Class> *getCondition( const char *name );
int findConditional( Conditional *condition );
int addConditional( Conditional *condition );
Conditional *getConditional( const char *name );
void GetAllAnims( Container<const char *> *c );
State *FindState( const char *name );
State *FindGlobalState( const char *name );
const char *Filename();
void ReadStates( Script *script );
State *GotoGlobalState( State *CurrentState, State *newState );
};
Condition<Class> *getCondition(const char *name);
int findConditional(Conditional *condition);
int addConditional(Conditional *condition);
Conditional *getConditional(const char *name);
void GetAllAnims(Container<const char *> *c);
State *FindState(const char *name);
State *FindGlobalState(const char *name);
const char *Filename();
void ReadStates(Script *script);
State* GotoGlobalState(State *CurrentState, State *newState);
};
inline const char *StateMap::Filename
(
void
)
(
void
)
{
return filename.c_str();
}
{
return filename.c_str();
}
inline const char *State::getName
(
void
)
(
void
)
{
return name.c_str();
}
{
return name.c_str();
}
inline State *State::getNextState
(
void
)
(
void
)
{
return statemap.FindState( nextState.c_str() );
}
{
return statemap.FindState(nextState.c_str());
}
inline movecontrol_t State::getMoveType
(
void
)
(
void
)
{
return movetype;
}
{
return movetype;
}
inline cameratype_t State::getCameraType
(
void
)
(
void
)
{
return cameratype;
}
{
return cameratype;
}
@ -541,26 +470,26 @@ inline cameratype_t State::getCameraType
//
//================================================
class FuzzyEngine : public Class
{
public :
FuzzyEngine( const char *filename, Condition<Class> *conditions, Container<Conditional *> *conditionals );
Condition<Class> *getCondition( const char *name );
int findConditional( Conditional *condition );
int addConditional( Conditional *condition );
Conditional *getConditional( const char *name );
FuzzyVar *FindFuzzyVar( const char *name );
const char *Filename();
void ReadFuzzyVars( const char *filename );
{
public:
FuzzyEngine(const char *filename, Condition<Class> *conditions, Container<Conditional *> *conditionals);
private :
Container<FuzzyVar *> _varList;
Condition<Class> *_current_conditions;
Container<Conditional *> *_current_conditionals;
str _filename;
Condition<Class> *getCondition(const char *name);
int findConditional(Conditional *condition);
int addConditional(Conditional *condition);
Conditional *getConditional(const char *name);
FuzzyVar *FindFuzzyVar(const char *name);
const char *Filename();
void ReadFuzzyVars(const char *filename);
};
private:
Container<FuzzyVar *> _varList;
Condition<Class> *_current_conditions;
Container<Conditional *> *_current_conditionals;
str _filename;
};
//================================================
// Class Name: Fuzzy Engine
@ -569,32 +498,32 @@ class FuzzyEngine : public Class
//
//================================================
class FuzzyVar : public Class
{
public:
FuzzyVar( const char *name, Script &script, FuzzyEngine &f_engine );
{
public:
FuzzyVar(const char *name, Script &script, FuzzyEngine &f_engine);
float Evaluate( Entity &ent, Container<Conditional *> *ent_conditionals );
int addCondition( const char *name, Script &script );
void readEvaluations( Script &script );
const char *getName( void );
float Evaluate(Entity &ent, Container<Conditional *> *ent_conditionals);
int addCondition(const char *name, Script &script);
void readEvaluations(Script &script);
private :
Container<int> _condition_indexes;
Container<Expression> _evaluations;
const char *getName(void);
FuzzyEngine &_fuzzyEngine;
private:
Container<int> _condition_indexes;
Container<Expression> _evaluations;
str _name;
Container<float> _points;
};
FuzzyEngine &_fuzzyEngine;
void ClearCachedStatemaps( void );
StateMap *GetStatemap( const str &filename, Condition<Class> *conditions, Container<Conditional *> *conditionals, qboolean reload, qboolean cache_only = false );
void CacheStatemap( const str &filename, Condition<Class> *conditions );
str _name;
Container<float> _points;
};
void ClearCachedFuzzyEngines( void );
FuzzyEngine *GetFuzzyEngine( const str &filename, Condition<Class> *conditions, Container<Conditional *> *conditionals, qboolean reload, qboolean cache_only = false );
void CacheFuzzyEngine( const str &filename, Condition<Class> *conditions );
void ClearCachedStatemaps(void);
StateMap *GetStatemap(const str &filename, Condition<Class> *conditions, Container<Conditional *> *conditionals, qboolean reload, qboolean cache_only = false);
void CacheStatemap(const str &filename, Condition<Class> *conditions);
void ClearCachedFuzzyEngines(void);
FuzzyEngine *GetFuzzyEngine(const str &filename, Condition<Class> *conditions, Container<Conditional *> *conditionals, qboolean reload, qboolean cache_only = false);
void CacheFuzzyEngine(const str &filename, Condition<Class> *conditions);
#endif /* !__CHARACTERSTATE_H__ */

2
dlls/game/health.cpp
View file

@ -43,7 +43,7 @@ void HealthInventoryItem::Use( Event *ev )
str sound_name;
other = ev->GetEntity( 1 );
other = ev->GetEntity<Entity>( 1 );
if ( !other || !other->isSubclassOf( Sentient ) )
{
return;

43
dlls/game/listener.h
View file

@ -532,7 +532,29 @@ class Event : public Class
void ReturnEntity( Entity *ent );
void AddEntity( Entity *ent );
Entity *GetEntity( int pos );
Entity* GetEntity(int pos)
{
if (data == nullptr || (pos < 1) || (data->NumObjects() < pos))
{
Error("Index %d out of range.", pos);
return nullptr;
}
return data->ObjectAt(pos).GetEntity(*this);
}
template <typename T>
T* GetEntity(int pos)
{
if (data == nullptr || (pos < 1) || (data->NumObjects() < pos))
{
Error("Index %d out of range.", pos);
return nullptr;
}
return dynamic_cast<T*>(data->ObjectAt(pos).GetEntity(*this));
}
void SetThread( CThread *thread );
CThread *GetThread( void );
@ -1128,25 +1150,6 @@ inline bool Event::GetBoolean
return ( val != 0 ) ? true : false;
}
#ifdef GAME_DLL
inline Entity *Event::GetEntity
(
int pos
)
{
if ( !data || ( pos < 1 ) || ( data->NumObjects() < pos ) )
{
Error( "Index %d out of range.", pos );
return NULL;
}
return data->ObjectAt( pos ).GetEntity( *this );
}
#endif
//===============================================================
// Name: SetToken

2
dlls/game/puzzleobject.cpp
View file

@ -542,7 +542,7 @@ void PuzzleObject::useEvent(Event* event)
Entity* entity;
if ( event->NumArgs() > 0 )
entity = event->GetEntity( 1 );
entity = event->GetEntity<Entity>( 1 );
else
entity = NULL;