diff --git a/Code/Game/DanBiasServer/GameSession/GameSession_Logic.cpp b/Code/Game/DanBiasServer/GameSession/GameSession_Logic.cpp index 275347ed..a0010f1f 100644 --- a/Code/Game/DanBiasServer/GameSession/GameSession_Logic.cpp +++ b/Code/Game/DanBiasServer/GameSession/GameSession_Logic.cpp @@ -10,6 +10,7 @@ #include #include +#define DELTA_TIME_20 0.05f #define DELTA_TIME_24 0.04166666666666666666666666666667f #define DELTA_TIME_30 0.03333333333333333333333333333333f #define DELTA_TIME_60 0.01666666666666666666666666666667f @@ -44,7 +45,7 @@ namespace DanBias double dt = this->timer.getElapsedSeconds(); gameInstance.SetFrameTimeLength((float)dt); - if(dt >= DELTA_TIME_60) + if(dt >= DELTA_TIME_20) { this->ParseEvents(); diff --git a/Code/Game/GameLogic/Game.h b/Code/Game/GameLogic/Game.h index 95f67a6b..b6f19eb8 100644 --- a/Code/Game/GameLogic/Game.h +++ b/Code/Game/GameLogic/Game.h @@ -32,14 +32,13 @@ namespace GameLogic ~PlayerData(); void Move(const PLAYER_MOVEMENT &movement) override; - void UseWeapon(int playerID, const WEAPON_FIRE &usage) override; + void UseWeapon(const WEAPON_FIRE &usage) override; int GetTeamID() const override; PLAYER_STATE GetState() const override; Oyster::Math::Float3 GetPosition() override; Oyster::Math::Float4x4 GetOrientation() override; int GetID() const override; OBJECT_TYPE GetObjectType() const override; - Player *player; }; diff --git a/Code/Game/GameLogic/GameAPI.h b/Code/Game/GameLogic/GameAPI.h index ffd13341..8e05c8cd 100644 --- a/Code/Game/GameLogic/GameAPI.h +++ b/Code/Game/GameLogic/GameAPI.h @@ -77,10 +77,9 @@ namespace GameLogic /******************************************************** * Uses the chosen players weapon based on input - * @param playerID: ID of the player you want to recieve the message * @param Usage: enum value on what kind of action is to be taken ********************************************************/ - virtual void UseWeapon(int playerID, const WEAPON_FIRE &usage) = 0; + virtual void UseWeapon(const WEAPON_FIRE &usage) = 0; /***/ virtual int GetTeamID() const = 0;