mirror of
https://github.com/ENSL/NS.git
synced 2024-11-30 00:10:57 +00:00
Mantis 0000971:
o Implemented teammate orders/query icons Mantis 0000992: o Implemented teammate order popups git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@52 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
parent
c000cbbc67
commit
e59df130fa
2 changed files with 16 additions and 0 deletions
|
@ -106,6 +106,7 @@
|
||||||
void NetMsg_SetupMap_Extents( entvars_t* const pev, const string& name, const float* const min_extents, const float* const max_extents, const bool draw_background );
|
void NetMsg_SetupMap_Extents( entvars_t* const pev, const string& name, const float* const min_extents, const float* const max_extents, const bool draw_background );
|
||||||
void NetMsg_SetupMap_Location( entvars_t* const pev, const string& name, const float* const min_extents, const float* const max_extents );
|
void NetMsg_SetupMap_Location( entvars_t* const pev, const string& name, const float* const min_extents, const float* const max_extents );
|
||||||
void NetMsg_UpdateEntityHierarchy( entvars_t* const pev, const MapEntityMap& NewItems, const EntityListType& OldItems );
|
void NetMsg_UpdateEntityHierarchy( entvars_t* const pev, const MapEntityMap& NewItems, const EntityListType& OldItems );
|
||||||
|
void NetMsg_IssueOrder(entvars_t* const pev, const int ordertype, const int ordersource, const int ordertarget);
|
||||||
|
|
||||||
//BROADCAST MESSAGE TRANSMISSION
|
//BROADCAST MESSAGE TRANSMISSION
|
||||||
void NetMsg_DeathMsg( const int killer_index, const int victim_index, string& weapon_name );
|
void NetMsg_DeathMsg( const int killer_index, const int victim_index, string& weapon_name );
|
||||||
|
@ -195,6 +196,7 @@
|
||||||
void NetMsg_SetupMap( void* const buffer, const int size, bool& is_location, string& name, float* min_extents, float* max_extents, bool& draw_background );
|
void NetMsg_SetupMap( void* const buffer, const int size, bool& is_location, string& name, float* min_extents, float* max_extents, bool& draw_background );
|
||||||
void NetMsg_UpdateCountdown( void* const buffer, const int size, int& countdown );
|
void NetMsg_UpdateCountdown( void* const buffer, const int size, int& countdown );
|
||||||
void NetMsg_UpdateEntityHierarchy( void* const buffer, const int size, MapEntityMap& NewItems, EntityListType& OldItems );
|
void NetMsg_UpdateEntityHierarchy( void* const buffer, const int size, MapEntityMap& NewItems, EntityListType& OldItems );
|
||||||
|
void NetMsg_IssueOrder( void* const buffer, const int size, int& ordertype, int& ordersource, int& ordertarget );
|
||||||
|
|
||||||
#endif //AVH_SERVER
|
#endif //AVH_SERVER
|
||||||
|
|
||||||
|
|
|
@ -82,6 +82,20 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef vector<AvHOrder> OrderListType;
|
typedef vector<AvHOrder> OrderListType;
|
||||||
|
// tankefugl: 0000971
|
||||||
|
typedef enum {
|
||||||
|
TEAMMATE_MARINE_ORDER_WELD = 0,
|
||||||
|
TEAMMATE_MARINE_ORDER_FOLLOW,
|
||||||
|
TEAMMATE_MARINE_ORDER_COVER,
|
||||||
|
TEAMMATE_MARINE_ORDER_UNKNOWN,
|
||||||
|
TEAMMATE_ALIEN_ORDER_HEAL,
|
||||||
|
TEAMMATE_ALIEN_ORDER_FOLLOW,
|
||||||
|
TEAMMATE_ALIEN_ORDER_COVER,
|
||||||
|
TEAMMATE_ALIEN_ORDER_UNKNOWN
|
||||||
|
} TeammateOrderEnum;
|
||||||
|
typedef pair<int, float> TeammateOrderType;
|
||||||
|
typedef map<int, TeammateOrderType> TeammateOrderListType;
|
||||||
|
// :tankefugl
|
||||||
|
|
||||||
void AvHChangeOrder(OrderListType& inList, const AvHOrder& inOrder);
|
void AvHChangeOrder(OrderListType& inList, const AvHOrder& inOrder);
|
||||||
//void AvHRemovePlayerFromOrders(OrderListType& inList, int inPlayerIndex);
|
//void AvHRemovePlayerFromOrders(OrderListType& inList, int inPlayerIndex);
|
||||||
|
|
Loading…
Reference in a new issue