dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Bind objectspecs to classes once all finalised.

Browse Source 
(cherry picked from commit 5f4a8f730b8982cbec7eec5e2331f0bc9217e69e)
This commit is contained in:
Peter Nelson
2023-01-16 23:31:31 +00:00
committed by Jonathan G Rennison
parent 9cda69cab1
commit d34e1bbbc1
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/newgrf_object.cpp
View File

@@ -93,6 +93,18 @@ uint ObjectSpec::Index() const
return this - _object_specs;
}
/**
* Tie all ObjectSpecs to their class.
*/
/* static */ void ObjectSpec::BindToClasses()
{
for (auto &spec : _object_specs) {
if (spec.IsEnabled() && spec.cls_id != INVALID_OBJECT_CLASS) {
ObjectClass::Assign(&spec);
}
}
}
/** This function initialize the spec arrays of objects. */
void ResetObjects()
{
@@ -107,20 +119,17 @@ void ResetObjects()
for (uint16 i = 0; i < lengthof(_original_objects); i++) {
_object_specs[i].grf_prop.local_id = i;
}
/* Set class for originals. */
_object_specs[OBJECT_LIGHTHOUSE].cls_id = ObjectClass::Allocate('LTHS');
_object_specs[OBJECT_TRANSMITTER].cls_id = ObjectClass::Allocate('TRNS');
}
template <typename Tspec, typename Tid, Tid Tmax>
/* static */ void NewGRFClass<Tspec, Tid, Tmax>::InsertDefaults()
{
ObjectClassID cls = ObjectClass::Allocate('LTHS');
ObjectClass::Get(cls)->name = STR_OBJECT_CLASS_LTHS;
_object_specs[OBJECT_LIGHTHOUSE].cls_id = cls;
ObjectClass::Assign(&_object_specs[OBJECT_LIGHTHOUSE]);
cls = ObjectClass::Allocate('TRNS');
ObjectClass::Get(cls)->name = STR_OBJECT_CLASS_TRNS;
_object_specs[OBJECT_TRANSMITTER].cls_id = cls;
ObjectClass::Assign(&_object_specs[OBJECT_TRANSMITTER]);
ObjectClass::Get(ObjectClass::Allocate('LTHS'))->name = STR_OBJECT_CLASS_LTHS;
ObjectClass::Get(ObjectClass::Allocate('TRNS'))->name = STR_OBJECT_CLASS_TRNS;
}
template <typename Tspec, typename Tid, Tid Tmax>