mirror of
https://github.com/unknownworlds/NS.git
synced 2024-11-22 12:41:36 +00:00
Mantis: 1050
o Adding missing checkins git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@152 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
parent
82f85bd26d
commit
b69e490956
2 changed files with 18 additions and 0 deletions
|
@ -280,6 +280,19 @@ bool AvHOrder::GetOrderCancelled() const
|
|||
return (this->mOrderStatus == kOrderStatusCancelled);
|
||||
}
|
||||
|
||||
// puzl: 1050
|
||||
// Need to sync the order status as it is only manipulated by the serverside state machine
|
||||
int AvHOrder::GetOrderStatus() const
|
||||
{
|
||||
return this->mOrderStatus;
|
||||
}
|
||||
#ifndef AVH_SERVER
|
||||
void AvHOrder::SetOrderStatus(int inOrderStatus)
|
||||
{
|
||||
this->mOrderStatus=inOrderStatus;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool AvHOrder::GetOrderCompleted() const
|
||||
{
|
||||
return (this->mOrderStatus == kOrderStatusComplete);
|
||||
|
|
|
@ -33,6 +33,10 @@ public:
|
|||
float GetTimeOrderCompleted() const;
|
||||
void SetTimeOrderCompleted(float inTime);
|
||||
#endif
|
||||
|
||||
#ifndef AVH_SERVER
|
||||
void SetOrderStatus(int inOrderStatus);
|
||||
#endif
|
||||
|
||||
// Shared
|
||||
AvHOrder();
|
||||
|
@ -41,6 +45,7 @@ public:
|
|||
EntityInfo GetReceiver() const;
|
||||
int GetTargetIndex() const;
|
||||
AvHOrderType GetOrderType() const;
|
||||
int GetOrderStatus() const;
|
||||
AvHOrderTargetType GetOrderTargetType() const;
|
||||
AvHUser3 GetTargetUser3Type() const;
|
||||
void GetLocation(vec3_t& outPosition) const;
|
||||
|
|
Loading…
Reference in a new issue