mdiluz/ttrts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Final fixes to indentation.

Browse source 
fixes #13
This commit is contained in:
mdiluzio 2014-12-21 11:19:37 +00:00
parent 263f6187d3
commit e90ddee67e
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/game/game.h
View file

@ -33,7 +33,7 @@ public:
// Check for a win, returns invalid for no win state reached // Check for a win, returns invalid for no win state reached
// Note: this function will return invalid a draw was reached // Note: this function will return invalid a draw was reached
// best practice would be to call with GetNumUnits() == 0 // best practice would be to call with GetNumUnits() == 0
player_t CheckForWin() const; player_t CheckForWin() const;
// Get the game information as a string // Get the game information as a string
std::string GetStateAsString() const; std::string GetStateAsString() const;
@ -52,11 +52,11 @@ public:
// Get unit and orderby index as above (not unit ID) // Get unit and orderby index as above (not unit ID)
inline const CUnit& GetUnitByIndex( unsigned int i ) const { return m_OrderUnitPairs[i].unit; } inline const CUnit& GetUnitByIndex( unsigned int i ) const { return m_OrderUnitPairs[i].unit; }
inline const SOrder & GetOrdersByIndex( unsigned int i ) const { return m_OrderUnitPairs[i].order; } inline const SOrder & GetOrdersByIndex( unsigned int i ) const { return m_OrderUnitPairs[i].order; }
// Get a unit by it's ID // Get a unit by it's ID
const CUnit& GetUnitByIDConst( unit_id_t id ) const; const CUnit& GetUnitByIDConst( unit_id_t id ) const;
const SOrder & GetOrderByIDConst( unit_id_t id ) const; const SOrder & GetOrderByIDConst( unit_id_t id ) const;
// Get dimensions // Get dimensions
inline const uvector2& GetDimensions() const { return dimensions; } inline const uvector2& GetDimensions() const { return dimensions; }
@ -71,7 +71,7 @@ public:
inline int GetTurn() const { return turn; } inline int GetTurn() const { return turn; }
// Get a vector of the players in the current game // Get a vector of the players in the current game
std::vector<player_t> GetPlayers() const; std::vector<player_t> GetPlayers() const;
private: private:

24
source/game/unit.h
View file

@ -38,13 +38,13 @@ public:
inline const unit_id_t& GetID() const { return unit_id; } inline const unit_id_t& GetID() const { return unit_id; }
inline const player_t & GetPlayer() const { return player_id; } inline const player_t & GetPlayer() const { return player_id; }
inline const unitvis_c & GetVisual() const { return unit_vis; } inline const unitvis_c & GetVisual() const { return unit_vis; }
inline const dir_c & GetDir() const { return dir; } inline const dir_c & GetDir() const { return dir; }
inline const uvector2& GetPos() const { return pos; } inline const uvector2& GetPos() const { return pos; }
// Set // Set
inline player_t SetPlayer(const player_t &v) { return (player_id = v); } inline player_t SetPlayer(const player_t &v) { return (player_id = v); }
inline unitvis_c SetVisual(const unitvis_c &v) { return (unit_vis = v); } inline unitvis_c SetVisual(const unitvis_c &v) { return (unit_vis = v); }
inline dir_c SetDir(const dir_c &v) { return (dir = v); } inline dir_c SetDir(const dir_c &v) { return (dir = v); }
inline void SetPos(const uvector2 &v) { pos = v; } inline void SetPos(const uvector2 &v) { pos = v; }
// Get the co-ordinate in front of the unit // Get the co-ordinate in front of the unit
@ -57,29 +57,29 @@ public:
bool SetFromVisual(const unitvis_c &vis); bool SetFromVisual(const unitvis_c &vis);
// Orientation methods // Orientation methods
dir_c TurnLeft(); dir_c TurnLeft();
dir_c TurnRight(); dir_c TurnRight();
dir_c TurnAround(); dir_c TurnAround();
private: private:
// Update my visual must be called when setting direction // Update my visual must be called when setting direction
unitvis_c UpdateMyVisual(); unitvis_c UpdateMyVisual();
// Unit ID // Unit ID
unit_id_t unit_id; unit_id_t unit_id;
// Visual // Visual
unitvis_c unit_vis; unitvis_c unit_vis;
// Player ID // Player ID
player_t player_id; player_t player_id;
// Direction // Direction
dir_c dir; dir_c dir;
// Position // Position
uvector2 pos; uvector2 pos;
}; };
// Typedef for a vector of units // Typedef for a vector of units