From b69e4909566b1a0d4644cae13e1bf2bdb7f711c3 Mon Sep 17 00:00:00 2001 From: puzl Date: Tue, 31 May 2005 11:33:22 +0000 Subject: [PATCH] Mantis: 1050 o Adding missing checkins git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@152 67975925-1194-0748-b3d5-c16f83f1a3a1 --- main/source/mod/AvHOrder.cpp | 13 +++++++++++++ main/source/mod/AvHOrder.h | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/main/source/mod/AvHOrder.cpp b/main/source/mod/AvHOrder.cpp index 905e2776..e6abadd7 100644 --- a/main/source/mod/AvHOrder.cpp +++ b/main/source/mod/AvHOrder.cpp @@ -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); diff --git a/main/source/mod/AvHOrder.h b/main/source/mod/AvHOrder.h index 15a5d8ca..69425341 100644 --- a/main/source/mod/AvHOrder.h +++ b/main/source/mod/AvHOrder.h @@ -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;