forked from 0ad/0ad
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.
81 lines
1.8 KiB
C++
81 lines
1.8 KiB
C++
//This class loads all the formation data needs to create an instance of a particular formation.
|
|
|
|
#ifndef INCLUDED_FORMATION
|
|
#define INCLUDED_FORMATION
|
|
|
|
#include <vector>
|
|
#include <map>
|
|
#include "ps/XML/Xeromyces.h"
|
|
|
|
class CStr;
|
|
|
|
class CFormation
|
|
{
|
|
friend class CFormationManager;
|
|
friend class CFormationCollection;
|
|
friend class CEntityFormation;
|
|
|
|
struct FormationSlot
|
|
{
|
|
float fileOff; //Distance between files of this slot and the formation's center
|
|
float rankOff;
|
|
std::vector<CStr> category;
|
|
};
|
|
|
|
public:
|
|
CFormation();
|
|
~CFormation(){}
|
|
|
|
const CStr& GetBonus(){ return m_bonus; }
|
|
const CStr& GetBonusBase(){ return m_bonusBase; }
|
|
const CStr& GetBonusType(){ return m_bonusType; }
|
|
float GetBonusVal(){ return m_bonusVal; }
|
|
|
|
const CStr& GetPenalty(){ return m_penalty; }
|
|
const CStr& GetPenaltyBase(){ return m_penaltyBase; }
|
|
const CStr& GetPenaltyType(){ return m_penaltyType; }
|
|
float GetPenaltyVal(){ return m_penaltyVal; }
|
|
|
|
const CStr& GetAnglePenalty(){ return m_anglePenalty; }
|
|
const CStr& GetAnglePenaltyType(){ return m_anglePenaltyType; }
|
|
int GetAnglePenaltyDivs(){ return m_anglePenaltyDivs; }
|
|
float GetAnglePenaltyVal(){ return m_anglePenaltyVal; }
|
|
|
|
|
|
private:
|
|
|
|
CStr m_tag;
|
|
CStr m_bonus;
|
|
CStr m_bonusBase;
|
|
CStr m_bonusType;
|
|
float m_bonusVal;
|
|
|
|
CStr m_penalty;
|
|
CStr m_penaltyBase;
|
|
CStr m_penaltyType;
|
|
float m_penaltyVal;
|
|
|
|
CStr m_anglePenalty;
|
|
int m_anglePenaltyDivs;
|
|
CStr m_anglePenaltyType;
|
|
float m_anglePenaltyVal;
|
|
|
|
size_t m_required;
|
|
CStr m_next;
|
|
CStr m_prior;
|
|
CStr m_movement;
|
|
float m_fileSpacing;
|
|
float m_rankSpacing;
|
|
|
|
size_t m_numSlots; //how many possible slots in this formation
|
|
size_t m_numRanks;
|
|
size_t m_numFiles;
|
|
|
|
//The key is the "order" of the slot
|
|
std::map<size_t, FormationSlot> m_slots;
|
|
|
|
bool LoadXml(const CStr& filename);
|
|
void AssignCategory(size_t order, CStr category); //takes care of formatting strings
|
|
};
|
|
#endif
|