diff options
| author | glx <glx@openttd.org> | 2007-10-25 23:24:28 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2007-10-25 23:24:28 +0000 |
| commit | 08503f5ba5f8ba615a01588a689b2445bb0ac847 (patch) | |
| tree | e0d1e0046943cae3e69f0e392f5d57347cedd7f9 /src/newgrf.cpp | |
| parent | 5da0e87d9dacb1e9399c65cc60f286d74a0aff72 (diff) | |
| download | openttd-08503f5ba5f8ba615a01588a689b2445bb0ac847.tar.xz | |
(svn r11341) -Codechange: add missing callback ID enums, add stub for house property 20 and reorder unimplemented action 0 properties
Diffstat (limited to 'src/newgrf.cpp')
| -rw-r--r-- | src/newgrf.cpp | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 3cf4334ec..abbf325eb 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -497,6 +497,12 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf rvi->tractive_effort = grf_load_byte(&buf); break; + case 0x20: // Air drag + /** @todo Air drag for trains. */ + grf_load_byte(&buf); + ret = true; + break; + case 0x21: // Shorter vehicle rvi->shorten_factor = grf_load_byte(&buf); break; @@ -545,12 +551,6 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf ei->base_intro = grf_load_dword(&buf); break; - case 0x20: // Air drag - /** @todo Air drag for trains. */ - grf_load_byte(&buf); - ret = true; - break; - default: ret = true; break; @@ -638,6 +638,13 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf ei->callbackmask = grf_load_byte(&buf); break; + case 0x18: // Tractive effort + case 0x19: // Air drag + /** @todo Tractive effort and air drag for road vehicles. */ + grf_load_byte(&buf); + ret = true; + break; + case 0x1A: // Refit cost ei->refit_cost = grf_load_byte(&buf); break; @@ -663,13 +670,6 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf ei->base_intro = grf_load_dword(&buf); break; - case 0x18: // Tractive effort - case 0x19: // Air drag - /** @todo Tractive effort and air drag for road vehicles. */ - grf_load_byte(&buf); - ret = true; - break; - default: ret = true; break; @@ -748,6 +748,13 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf ei->refit_cost = grf_load_byte(&buf); break; + case 0x14: // Ocean speed fraction + case 0x15: // Canal speed fraction + /** @todo Speed fractions for ships on oceans and canals */ + grf_load_byte(&buf); + ret = true; + break; + case 0x16: // Retire vehicle early ei->retire_early = grf_load_byte(&buf); break; @@ -769,13 +776,6 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf ei->base_intro = grf_load_dword(&buf); break; - case 0x14: // Ocean speed fraction - case 0x15: // Canal speed fraction - /** @todo Speed fractions for ships on oceans and canals */ - grf_load_byte(&buf); - ret = true; - break; - default: ret = true; break; @@ -1394,6 +1394,12 @@ static bool TownHouseChangeInfo(uint hid, int numinfo, int prop, byte **bufp, in housespec->minimum_life = grf_load_byte(&buf); break; + case 0x20: { // @todo Cargo acceptance watch list + byte count = grf_load_byte(&buf); + for (byte j = 0; j < count; j++) grf_load_byte(&buf); + ret = true; + } break; + default: ret = true; break; |