mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r24165) -Codechange: Split parts of static NewGRFClass::Assign() into non-static Insert().

release/1.3
frosch 2012-04-22 16:28:09 +00:00
parent 48c44a8d21
commit cb43494488
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf_class.h
View File

@ -39,6 +39,8 @@ public:
uint32 global_id; ///< Global ID for class, e.g. 'DFLT', 'WAYP', etc. uint32 global_id; ///< Global ID for class, e.g. 'DFLT', 'WAYP', etc.
StringID name; ///< Name of this class. StringID name; ///< Name of this class.
void Insert(Tspec *spec);
static void Reset(); static void Reset();
static Tid Allocate(uint32 global_id); static Tid Allocate(uint32 global_id);
static void Assign(Tspec *spec); static void Assign(Tspec *spec);

20
src/newgrf_class_func.h
View File

@ -70,6 +70,18 @@ DEFINE_NEWGRF_CLASS_METHOD(Tid)::Allocate(uint32 global_id)
return (Tid)0; return (Tid)0;
} }
/**
* Insert a spec into the class.
* @param spec The spec to insert.
*/
DEFINE_NEWGRF_CLASS_METHOD(void)::Insert(Tspec *spec)
{
uint i = this->count++;
this->spec = ReallocT(this->spec, this->count);
this->spec[i] = spec;
}
/** /**
* Assign a spec to one of the classes. * Assign a spec to one of the classes.
* @param spec The spec to assign. * @param spec The spec to assign.
@ -78,12 +90,7 @@ DEFINE_NEWGRF_CLASS_METHOD(Tid)::Allocate(uint32 global_id)
DEFINE_NEWGRF_CLASS_METHOD(void)::Assign(Tspec *spec) DEFINE_NEWGRF_CLASS_METHOD(void)::Assign(Tspec *spec)
{ {
assert(spec->cls_id < Tmax); assert(spec->cls_id < Tmax);
NewGRFClass<Tspec, Tid, Tmax> *cls = &classes[spec->cls_id]; Get(spec->cls_id)->Insert(spec);
uint i = cls->count++;
cls->spec = ReallocT(cls->spec, cls->count);
cls->spec[i] = spec;
} }
/** /**
@ -169,6 +176,7 @@ DEFINE_NEWGRF_CLASS_METHOD(const Tspec *)::GetByGrf(uint32 grfid, byte local_id,
template void name::ResetClass(); \ template void name::ResetClass(); \
template void name::Reset(); \ template void name::Reset(); \
template Tid name::Allocate(uint32 global_id); \ template Tid name::Allocate(uint32 global_id); \
template void name::Insert(Tspec *spec); \
template void name::Assign(Tspec *spec); \ template void name::Assign(Tspec *spec); \
template NewGRFClass<Tspec, Tid, Tmax> *name::Get(Tid cls_id); \ template NewGRFClass<Tspec, Tid, Tmax> *name::Get(Tid cls_id); \
template uint name::GetCount(); \ template uint name::GetCount(); \