Mantis 0000971:

o Implemented teammate orders/query icons

Mantis 0000992:
o Implemented teammate order popups

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@51 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl 2005-04-10 21:18:44 +00:00
parent aeb2514103
commit c000cbbc67

View file

@ -397,6 +397,9 @@ public:
int GameStatus(const char* pszName, int iSize, void* pbuf); int GameStatus(const char* pszName, int iSize, void* pbuf);
int MiniMap(const char* pszName, int iSize, void* pbuf); int MiniMap(const char* pszName, int iSize, void* pbuf);
// tankefugl: 0000971
int IssueOrder(const char* pszName, int iSize, void* pbuf);
// :tankefugl
int Progress(const char* pszName, int iSize, void* pbuf); int Progress(const char* pszName, int iSize, void* pbuf);
int SetGmma(const char* pszName, int iSize, void* pbuf); int SetGmma(const char* pszName, int iSize, void* pbuf);
int SetSelect(const char* pszName, int iSize, void* pbuf); int SetSelect(const char* pszName, int iSize, void* pbuf);
@ -440,12 +443,20 @@ private:
void DrawMouseCursor(int inBaseX, int inBaseY); void DrawMouseCursor(int inBaseX, int inBaseY);
void DrawOrders(); void DrawOrders();
void DrawHelpIcons(); void DrawHelpIcons();
// tankefugl: 0000971
void DrawTeammateOrders();
// tankefugl: 0000992
void DrawDisplayOrder();
void SetDisplayOrder(int inOrderType, int inOrderIndex, string inText1, string inText2, string inText3);
// :tankefugl
void DrawHUDStructureNotification(); void DrawHUDStructureNotification();
void DrawInfoLocationText(); void DrawInfoLocationText();
void DrawPlayerNames(); void DrawPlayerNames();
void DrawReticleInfo(); void DrawReticleInfo();
void DrawToolTips(); void DrawToolTips();
void DrawWorldSprite(int inSpriteHandle, int inRenderMode, vec3_t inWorldPosition, int inFrame, float inWorldSize); // tankefugl: 0000971 -- added inAlpha
void DrawWorldSprite(int inSpriteHandle, int inRenderMode, vec3_t inWorldPosition, int inFrame, float inWorldSize, float inAlpha = 1.0f);
// :tankefugl
void DrawOrderIcon(const AvHOrder& inOrder); void DrawOrderIcon(const AvHOrder& inOrder);
void DrawOrderText(const AvHOrder& inOrder); void DrawOrderText(const AvHOrder& inOrder);
int GetFrameForOrderType(AvHOrderType inOrderType) const; int GetFrameForOrderType(AvHOrderType inOrderType) const;
@ -584,6 +595,20 @@ private:
OrderListType mOrders; OrderListType mOrders;
//AvHOrderType mOrderMode; //AvHOrderType mOrderMode;
// tankefugl: 0000971
map< int, TeammateOrderType > mTeammateOrder;
// tankefugl: 0000992
float mDisplayOrderTime;
int mDisplayOrderType;
int mDisplayOrderIndex;
string mDisplayOrderText1;
string mDisplayOrderText2;
string mDisplayOrderText3;
int mCurrentOrderTarget;
int mCurrentOrderType;
float mCurrentOrderTime;
// :tankefugl
AvHMessageID mTechEvent; AvHMessageID mTechEvent;
AvHMessageID mAlienAbility; AvHMessageID mAlienAbility;
AvHMessageID mGroupEvent; AvHMessageID mGroupEvent;
@ -671,6 +696,10 @@ private:
HSPRITE mMarineOrderIndicator; HSPRITE mMarineOrderIndicator;
HSPRITE mMarineUpgradesSprite; HSPRITE mMarineUpgradesSprite;
// tankefugl: 0000971
HSPRITE mTeammateOrderSprite;
// :tankefugl
typedef map<int, int> SpriteListType; typedef map<int, int> SpriteListType;
SpriteListType mActionButtonSprites; SpriteListType mActionButtonSprites;
//SpriteListType mHelpSprites; //SpriteListType mHelpSprites;