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

Codechange: Use std::vector for NewGRF class lists.

pull/10594/head
Peter Nelson 2023-01-08 15:36:57 +00:00 committed by PeterN
parent 73474b08fe
commit 02961fd7af
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/newgrf_class.h
View File

@ -12,15 +12,16 @@
#include "strings_type.h" #include "strings_type.h"
#include <vector>
/** /**
* Struct containing information relating to NewGRF classes for stations and airports. * Struct containing information relating to NewGRF classes for stations and airports.
*/ */
template <typename Tspec, typename Tid, Tid Tmax> template <typename Tspec, typename Tid, Tid Tmax>
struct NewGRFClass { struct NewGRFClass {
private: private:
uint count; ///< Number of specs in this class. uint ui_count; ///< Number of specs in this class potentially available to the user.
uint ui_count; ///< Number of specs in this class potentially available to the user. std::vector<Tspec *> spec; ///< List of specifications.
Tspec **spec; ///< Array of specifications.
/** /**
* The actual classes. * The actual classes.
@ -41,7 +42,7 @@ public:
void Insert(Tspec *spec); void Insert(Tspec *spec);
/** Get the number of allocated specs within the class. */ /** Get the number of allocated specs within the class. */
uint GetSpecCount() const { return this->count; } uint GetSpecCount() const { return static_cast<uint>(this->spec.size()); }
/** Get the number of potentially user-available specs within the class. */ /** Get the number of potentially user-available specs within the class. */
uint GetUISpecCount() const { return this->ui_count; } uint GetUISpecCount() const { return this->ui_count; }
int GetUIFromIndex(int index) const; int GetUIFromIndex(int index) const;

14
src/newgrf_class_func.h
View File

@ -28,11 +28,9 @@ DEFINE_NEWGRF_CLASS_METHOD(void)::ResetClass()
{ {
this->global_id = 0; this->global_id = 0;
this->name = STR_EMPTY; this->name = STR_EMPTY;
this->count = 0;
this->ui_count = 0; this->ui_count = 0;
free(this->spec); this->spec.clear();
this->spec = nullptr;
} }
/** Reset the classes, i.e. clear everything. */ /** Reset the classes, i.e. clear everything. */
@ -75,12 +73,9 @@ DEFINE_NEWGRF_CLASS_METHOD(Tid)::Allocate(uint32 global_id)
*/ */
DEFINE_NEWGRF_CLASS_METHOD(void)::Insert(Tspec *spec) DEFINE_NEWGRF_CLASS_METHOD(void)::Insert(Tspec *spec)
{ {
uint i = this->count++; this->spec.push_back(spec);
this->spec = ReallocT(this->spec, this->count);
this->spec[i] = spec; if (this->IsUIAvailable(static_cast<uint>(this->spec.size() - 1))) this->ui_count++;
if (this->IsUIAvailable(i)) this->ui_count++;
} }
/** /**
@ -197,7 +192,8 @@ DEFINE_NEWGRF_CLASS_METHOD(const Tspec *)::GetByGrf(uint32 grfid, byte local_id,
uint j; uint j;
for (Tid i = (Tid)0; i < Tmax; i++) { for (Tid i = (Tid)0; i < Tmax; i++) {
for (j = 0; j < classes[i].count; j++) { uint count = static_cast<uint>(classes[i].spec.size());
for (j = 0; j < count; j++) {
const Tspec *spec = classes[i].spec[j]; const Tspec *spec = classes[i].spec[j];
if (spec == nullptr) continue; if (spec == nullptr) continue;
if (spec->grf_prop.grffile->grfid == grfid && spec->grf_prop.local_id == local_id) { if (spec->grf_prop.grffile->grfid == grfid && spec->grf_prop.local_id == local_id) {