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

(svn r16376) -Codechange: Vehicle::Tick() now returns false if the vehicle was deleted

Browse Source
This commit is contained in:
smatz
2009-05-22 13:53:14 +00:00
parent 561d97880d
commit b687ac51ee
13 changed files with 189 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehicle_base.h
View File

@@ -423,8 +423,9 @@ public:
/**
* Calls the tick handler of the vehicle
* @return is this vehicle still valid?
*/
virtual void Tick() {};
virtual bool Tick() { return true; };
/**
* Calls the new day handler of the vehicle
@@ -620,7 +621,7 @@ struct DisasterVehicle : public Vehicle {
const char *GetTypeString() const { return "disaster vehicle"; }
void UpdateDeltaXY(Direction direction);
void Tick();
bool Tick();
};
/**
@@ -639,7 +640,6 @@ struct InvalidVehicle : public Vehicle {
virtual ~InvalidVehicle() {}
const char *GetTypeString() const { return "invalid vehicle"; }
void Tick() {}
};
#define FOR_ALL_VEHICLES_FROM(v, start) for (v = Vehicle::Get(start); v != NULL; v = (v->index + 1U < Vehicle::GetPoolSize()) ? Vehicle::Get(v->index + 1) : NULL) if (v->IsValid())