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.
58 lines
2.0 KiB
C++
58 lines
2.0 KiB
C++
// EntityTemplateCollection.h
|
|
//
|
|
// Keeps tabs on the various types of entity that roam the world.
|
|
//
|
|
// General note: Template, Base Entity, and Entity Class are used more-or-less interchangably.
|
|
//
|
|
// Usage: g_EntityTemplateCollection.LoadTemplates(): loads all templates
|
|
// g_EntityTemplateCollection.GetTemplate(name): get a template by name
|
|
//
|
|
// EntityTemplateCollection will look at all subdirectiroes of entities/, but each template's
|
|
// name will only be its filename; thus, no two templates should have the same filename,
|
|
// but subdirectories can be created in entities/ to organize the files nicely.
|
|
|
|
#ifndef INCLUDED_ENTITYTEMPLATECOLLECTION
|
|
#define INCLUDED_ENTITYTEMPLATECOLLECTION
|
|
|
|
#include <vector>
|
|
#include <map>
|
|
#include "ps/CStr.h"
|
|
#include "ps/Singleton.h"
|
|
#include "ps/Game.h"
|
|
#include "ps/Filesystem.h"
|
|
|
|
#define g_EntityTemplateCollection CEntityTemplateCollection::GetSingleton()
|
|
|
|
class CPlayer;
|
|
class CEntityTemplate;
|
|
|
|
class CEntityTemplateCollection : public Singleton<CEntityTemplateCollection>
|
|
{
|
|
// TODO: PS_MAX_PLAYERS doesn't seem to be an upper limit -
|
|
// "This may be overridden by system.cfg ("max_players")"
|
|
// - so we shouldn't use it here
|
|
static const size_t NULL_PLAYER = (PS_MAX_PLAYERS+1);
|
|
|
|
typedef STL_HASH_MAP<CStrW, CEntityTemplate*, CStrW_hash_compare> TemplateMap;
|
|
typedef STL_HASH_MAP<CStrW, CStr, CStrW_hash_compare> TemplateFilenameMap;
|
|
|
|
TemplateMap m_templates[PS_MAX_PLAYERS + 2];
|
|
TemplateFilenameMap m_templateFilenames;
|
|
public:
|
|
~CEntityTemplateCollection();
|
|
CEntityTemplate* GetTemplate( const CStrW& entityType, CPlayer* player = 0 );
|
|
|
|
// Load list of template filenames
|
|
int LoadTemplates();
|
|
void LoadFile( const VfsPath& path );
|
|
|
|
// Create a list of the names of all base entities, excluding template_*,
|
|
// for display in ScEd's entity-selection box.
|
|
void GetEntityTemplateNames( std::vector<CStrW>& names );
|
|
|
|
// Get all the templates owned by a specific player, which is useful for techs
|
|
void GetPlayerTemplates( CPlayer* player, std::vector<CEntityTemplate*>& dest );
|
|
};
|
|
|
|
#endif
|