diff options
| author | rubidium <rubidium@openttd.org> | 2007-03-08 16:27:54 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-03-08 16:27:54 +0000 |
| commit | ce919e8c719f0f698ac86dcaa528368316f2e52d (patch) | |
| tree | e32a4dc6207efbaacc5af4e5c41a353b98b9a897 /src/oldloader.cpp | |
| parent | aca3fb2b6ef69ae571b167d3071edd46d0ed383c (diff) | |
| download | openttd-ce919e8c719f0f698ac86dcaa528368316f2e52d.tar.xz | |
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
Diffstat (limited to 'src/oldloader.cpp')
| -rw-r--r-- | src/oldloader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/oldloader.cpp b/src/oldloader.cpp index 4ccfc8cd0..bdf1cf9e6 100644 --- a/src/oldloader.cpp +++ b/src/oldloader.cpp @@ -1068,13 +1068,13 @@ static bool LoadOldVehicleUnion(LoadgameState *ls, int num) * Basically v->type -= 0x10; would suffice, but play safely */ switch (v->type) { default: NOT_REACHED(); - case 0x00 /*VEH_Invalid */: v->type = VEH_Invalid; res = LoadChunk(ls, NULL, vehicle_empty_chunk); break; - case 0x10 /*VEH_Train */: v->type = VEH_Train; res = LoadChunk(ls, &v->u.rail, vehicle_train_chunk); break; - case 0x11 /*VEH_Road */: v->type = VEH_Road; res = LoadChunk(ls, &v->u.road, vehicle_road_chunk); break; - case 0x12 /*VEH_Ship */: v->type = VEH_Ship; res = LoadChunk(ls, &v->u.ship, vehicle_ship_chunk); break; - case 0x13 /*VEH_Aircraft*/: v->type = VEH_Aircraft; res = LoadChunk(ls, &v->u.air, vehicle_air_chunk); break; - case 0x14 /*VEH_Special */: v->type = VEH_Special; res = LoadChunk(ls, &v->u.special, vehicle_special_chunk); break; - case 0x15 /*VEH_Disaster*/: v->type = VEH_Disaster; res = LoadChunk(ls, &v->u.disaster, vehicle_disaster_chunk); break; + case 0x00 /*VEH_INVALID */: v->type = VEH_INVALID; res = LoadChunk(ls, NULL, vehicle_empty_chunk); break; + case 0x10 /*VEH_TRAIN */: v->type = VEH_TRAIN; res = LoadChunk(ls, &v->u.rail, vehicle_train_chunk); break; + case 0x11 /*VEH_ROAD */: v->type = VEH_ROAD; res = LoadChunk(ls, &v->u.road, vehicle_road_chunk); break; + case 0x12 /*VEH_SHIP */: v->type = VEH_SHIP; res = LoadChunk(ls, &v->u.ship, vehicle_ship_chunk); break; + case 0x13 /*VEH_AIRCRAFT*/: v->type = VEH_AIRCRAFT; res = LoadChunk(ls, &v->u.air, vehicle_air_chunk); break; + case 0x14 /*VEH_SPECIAL */: v->type = VEH_SPECIAL; res = LoadChunk(ls, &v->u.special, vehicle_special_chunk); break; + case 0x15 /*VEH_DISASTER*/: v->type = VEH_DISASTER; res = LoadChunk(ls, &v->u.disaster, vehicle_disaster_chunk); break; } /* This chunk size should always be 10 bytes */ @@ -1209,7 +1209,7 @@ static bool LoadOldVehicle(LoadgameState *ls, int num) v->string_id = RemapOldStringID(_old_string_id); /* Vehicle-subtype is different in TTD(Patch) */ - if (v->type == VEH_Special) v->subtype = v->subtype >> 1; + if (v->type == VEH_SPECIAL) v->subtype = v->subtype >> 1; } return true; |