janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
47 lines
1.2 KiB
C++
47 lines
1.2 KiB
C++
//This keeps track of all the formations exisisting in the game.
|
|
|
|
#ifndef INCLUDED_FORMATIONMANAGER
|
|
#define INCLUDED_FORMATIONMANAGER
|
|
|
|
#include "ps/Singleton.h"
|
|
#include "scripting/DOMEvent.h"
|
|
|
|
#define g_FormationManager CFormationManager::GetSingleton()
|
|
|
|
class CEntity;
|
|
class CStr;
|
|
class CFormation;
|
|
class CVector2D;
|
|
class CEntityFormation;
|
|
|
|
struct CEntityList;
|
|
|
|
class CFormationManager : public Singleton<CFormationManager>
|
|
{
|
|
#define FormIterator std::vector<CEntityFormation*>::iterator
|
|
|
|
public:
|
|
CFormationManager() {}
|
|
~CFormationManager();
|
|
void CreateFormation( CEntityList& entities, CStrW& name );
|
|
//entity is any unit in the formation
|
|
void DestroyFormation( size_t form );
|
|
inline bool IsValidFormation( size_t index )
|
|
{
|
|
return ((size_t)index < m_formations.size() && index >= 0);
|
|
}
|
|
bool AddUnit( CEntity* entity, size_t& form );
|
|
CEntityList AddUnitList( CEntityList& entities, size_t form );
|
|
|
|
//Returns false if the formation is destroyed
|
|
bool RemoveUnit( CEntity* entity );
|
|
bool RemoveUnitList( CEntityList& entities );
|
|
CEntityFormation* GetFormation(size_t form);
|
|
void UpdateIndexes( size_t update );
|
|
|
|
private:
|
|
std::vector<CEntityFormation*> m_formations;
|
|
};
|
|
|
|
#endif // INCLUDED_FORMATIONMANAGER
|