mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-06-19 06:43:58 -07:00
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.
52 lines
805 B
C++
52 lines
805 B
C++
#ifndef SIMSTATE_INCLUDED
|
|
#define SIMSTATE_INCLUDED
|
|
|
|
#include <set>
|
|
#include <vector>
|
|
|
|
#include "ps/CStr.h"
|
|
#include "maths/Vector3D.h"
|
|
|
|
class CUnit;
|
|
class CEntity;
|
|
|
|
class SimState
|
|
{
|
|
public:
|
|
class Entity
|
|
{
|
|
public:
|
|
static Entity Freeze(CUnit* unit);
|
|
CEntity* Thaw();
|
|
private:
|
|
CStrW templateName;
|
|
size_t unitID;
|
|
std::set<CStr> selections;
|
|
size_t playerID;
|
|
CVector3D position;
|
|
float angle;
|
|
};
|
|
|
|
class Nonentity
|
|
{
|
|
public:
|
|
static Nonentity Freeze(CUnit* unit);
|
|
CUnit* Thaw();
|
|
private:
|
|
CStrW actorName;
|
|
size_t unitID;
|
|
std::set<CStr> selections;
|
|
CVector3D position;
|
|
float angle;
|
|
};
|
|
|
|
static SimState* Freeze(bool onlyEntities);
|
|
void Thaw();
|
|
|
|
private:
|
|
bool onlyEntities;
|
|
std::vector<Entity> entities;
|
|
std::vector<Nonentity> nonentities;
|
|
};
|
|
|
|
#endif // SIMSTATE_INCLUDED
|