NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GameLogic - fixed some minor merging errors

This commit is contained in:
Dennis Andersen 2014-01-20 16:02:26 +01:00
parent ab2a3a3892
commit 1a3c63cda9
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Code/Game/DanBiasServer/GameSession/GameSession_Logic.cpp
View File

@ -10,6 +10,7 @@
#include <Windows.h> #include <Windows.h>
#include <OysterMath.h> #include <OysterMath.h>
#define DELTA_TIME_20 0.05f
#define DELTA_TIME_24 0.04166666666666666666666666666667f #define DELTA_TIME_24 0.04166666666666666666666666666667f
#define DELTA_TIME_30 0.03333333333333333333333333333333f #define DELTA_TIME_30 0.03333333333333333333333333333333f
#define DELTA_TIME_60 0.01666666666666666666666666666667f #define DELTA_TIME_60 0.01666666666666666666666666666667f
@ -44,7 +45,7 @@ namespace DanBias
double dt = this->timer.getElapsedSeconds(); double dt = this->timer.getElapsedSeconds();
gameInstance.SetFrameTimeLength((float)dt); gameInstance.SetFrameTimeLength((float)dt);
if(dt >= DELTA_TIME_60) if(dt >= DELTA_TIME_20)
{ {
this->ParseEvents(); this->ParseEvents();

3
Code/Game/GameLogic/Game.h
View File

@ -32,14 +32,13 @@ namespace GameLogic
~PlayerData(); ~PlayerData();
void Move(const PLAYER_MOVEMENT &movement) override; 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; int GetTeamID() const override;
PLAYER_STATE GetState() const override; PLAYER_STATE GetState() const override;
Oyster::Math::Float3 GetPosition() override; Oyster::Math::Float3 GetPosition() override;
Oyster::Math::Float4x4 GetOrientation() override; Oyster::Math::Float4x4 GetOrientation() override;
int GetID() const override; int GetID() const override;
OBJECT_TYPE GetObjectType() const override; OBJECT_TYPE GetObjectType() const override;
Player *player; Player *player;
}; };

3
Code/Game/GameLogic/GameAPI.h
View File

@ -77,10 +77,9 @@ namespace GameLogic
/******************************************************** /********************************************************
* Uses the chosen players weapon based on input * 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 * @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; virtual int GetTeamID() const = 0;