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

OrderUnitPair -> SOrderUnitPair

Browse source
This commit is contained in:
mdiluzio 2014-12-21 10:31:00 +00:00
parent d71983dcb1
commit 9551560bc0
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/game/game.h
View file

@ -9,22 +9,22 @@
#define GAME_HEADER_DELIMITER "~~~~\n"
// Type for order and unit pairs
struct OrderUnitPair
struct SOrderUnitPair
{
// Straight up move constructor
OrderUnitPair( OrderUnitPair&& other )
SOrderUnitPair( SOrderUnitPair && other )
: unit ( std::move(other.unit) )
, order ( other.order )
{}
// Multi parameter constructor
OrderUnitPair( CUnit&& u, COrder o )
SOrderUnitPair( CUnit&& u, COrder o )
: unit ( std::move(u) )
, order ( o )
{}
// Move assignment operator
inline OrderUnitPair& operator=( OrderUnitPair&& rhs )
inline SOrderUnitPair & operator=( SOrderUnitPair && rhs )
{
this->unit = std::move(rhs.unit);
this->order = std::move(rhs.order);
@ -36,7 +36,7 @@ struct OrderUnitPair
};
// Typedef for a vector of these unit pairs
typedef std::vector< OrderUnitPair > OrderUnitPairVector;
typedef std::vector<SOrderUnitPair> OrderUnitPairVector;
// Full TTRTS Game class
// Stores information about the game
@ -109,7 +109,7 @@ private:
int VerifyPos( uvector2 vec ) const;
// Get a units new position after an order
uvector2 GetNewPosition( const OrderUnitPair& pair ) const;
uvector2 GetNewPosition( const SOrderUnitPair & pair ) const;
// Check for a pass through
static bool CheckForPassThrough( const CUnit& one, const CUnit& two );