petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r21858) -Codechange: Give more similar names to ArticulatedPart functions.

Browse Source
This commit is contained in:
terkhen
2011-01-19 18:41:53 +00:00
parent 10a7678beb
commit cfbbcf1597
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/train.h
View File

@@ -267,7 +267,7 @@ struct Train : public GroundVehicle<Train, VEH_TRAIN> {
* Result is undefined for normal engine.
* @return next part of articulated engine
*/
FORCEINLINE Train *GetNextArticPart() const
FORCEINLINE Train *GetNextArticulatedPart() const
{
assert(this->HasArticulatedPart());
return this->Next();
@@ -302,7 +302,7 @@ struct Train : public GroundVehicle<Train, VEH_TRAIN> {
FORCEINLINE Train *GetLastEnginePart()
{
Train *v = this;
while (v->HasArticulatedPart()) v = v->GetNextArticPart();
while (v->HasArticulatedPart()) v = v->GetNextArticulatedPart();
return v;
}
@@ -313,7 +313,7 @@ struct Train : public GroundVehicle<Train, VEH_TRAIN> {
FORCEINLINE Train *GetNextVehicle() const
{
const Train *v = this;
while (v->HasArticulatedPart()) v = v->GetNextArticPart();
while (v->HasArticulatedPart()) v = v->GetNextArticulatedPart();
/* v now contains the last artic part in the engine */
return v->Next();