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

(svn r24164) -Codechange: Split parts of static NewGRFClass::Reset() into non-static ResetClass().

release/1.3
frosch 2012-04-22 16:28:04 +00:00
parent b3c84fcbbd
commit 48c44a8d21
2 changed files with 15 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

@ -30,6 +30,8 @@ private:
*/ */
static NewGRFClass<Tspec, Tid, Tmax> classes[Tmax]; static NewGRFClass<Tspec, Tid, Tmax> classes[Tmax];
void ResetClass();
/** Initialise the defaults. */ /** Initialise the defaults. */
static void InsertDefaults(); static void InsertDefaults();

19
src/newgrf_class_func.h
View File

@ -25,16 +25,22 @@
template <typename Tspec, typename Tid, Tid Tmax> template <typename Tspec, typename Tid, Tid Tmax>
NewGRFClass<Tspec, Tid, Tmax> NewGRFClass<Tspec, Tid, Tmax>::classes[Tmax]; NewGRFClass<Tspec, Tid, Tmax> NewGRFClass<Tspec, Tid, Tmax>::classes[Tmax];
/** Reset the class, i.e. clear everything. */
DEFINE_NEWGRF_CLASS_METHOD(void)::ResetClass()
{
this->global_id = 0;
this->name = STR_EMPTY;
this->count = 0;
free(this->spec);
this->spec = NULL;
}
/** Reset the classes, i.e. clear everything. */ /** Reset the classes, i.e. clear everything. */
DEFINE_NEWGRF_CLASS_METHOD(void)::Reset() DEFINE_NEWGRF_CLASS_METHOD(void)::Reset()
{ {
for (Tid i = (Tid)0; i < Tmax; i++) { for (Tid i = (Tid)0; i < Tmax; i++) {
classes[i].global_id = 0; classes[i].ResetClass();
classes[i].name = STR_EMPTY;
classes[i].count = 0;
free(classes[i].spec);
classes[i].spec = NULL;
} }
InsertDefaults(); InsertDefaults();
@ -160,6 +166,7 @@ DEFINE_NEWGRF_CLASS_METHOD(const Tspec *)::GetByGrf(uint32 grfid, byte local_id,
/** Force instantiation of the methods so we don't get linker errors. */ /** Force instantiation of the methods so we don't get linker errors. */
#define INSTANTIATE_NEWGRF_CLASS_METHODS(name, Tspec, Tid, Tmax) \ #define INSTANTIATE_NEWGRF_CLASS_METHODS(name, Tspec, Tid, Tmax) \
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::Assign(Tspec *spec); \ template void name::Assign(Tspec *spec); \