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

(svn r11341) -Codechange: add missing callback ID enums, add stub for house property 20 and reorder unimplemented action 0 properties

Browse Source
This commit is contained in:
glx
2007-10-25 23:24:28 +00:00
parent 5da0e87d9d
commit 08503f5ba5
2 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/newgrf.cpp
View File

@@ -497,6 +497,12 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
rvi->tractive_effort = grf_load_byte(&buf); rvi->tractive_effort = grf_load_byte(&buf);
break; break;
case 0x20: // Air drag
/** @todo Air drag for trains. */
grf_load_byte(&buf);
ret = true;
break;
case 0x21: // Shorter vehicle case 0x21: // Shorter vehicle
rvi->shorten_factor = grf_load_byte(&buf); rvi->shorten_factor = grf_load_byte(&buf);
break; break;
@@ -545,12 +551,6 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
ei->base_intro = grf_load_dword(&buf); ei->base_intro = grf_load_dword(&buf);
break; break;
case 0x20: // Air drag
/** @todo Air drag for trains. */
grf_load_byte(&buf);
ret = true;
break;
default: default:
ret = true; ret = true;
break; break;
@@ -638,6 +638,13 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
ei->callbackmask = grf_load_byte(&buf); ei->callbackmask = grf_load_byte(&buf);
break; 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 case 0x1A: // Refit cost
ei->refit_cost = grf_load_byte(&buf); ei->refit_cost = grf_load_byte(&buf);
break; break;
@@ -663,13 +670,6 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
ei->base_intro = grf_load_dword(&buf); ei->base_intro = grf_load_dword(&buf);
break; 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: default:
ret = true; ret = true;
break; break;
@@ -748,6 +748,13 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
ei->refit_cost = grf_load_byte(&buf); ei->refit_cost = grf_load_byte(&buf);
break; 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 case 0x16: // Retire vehicle early
ei->retire_early = grf_load_byte(&buf); ei->retire_early = grf_load_byte(&buf);
break; break;
@@ -769,13 +776,6 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
ei->base_intro = grf_load_dword(&buf); ei->base_intro = grf_load_dword(&buf);
break; 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: default:
ret = true; ret = true;
break; break;
@@ -1394,6 +1394,12 @@ static bool TownHouseChangeInfo(uint hid, int numinfo, int prop, byte **bufp, in
housespec->minimum_life = grf_load_byte(&buf); housespec->minimum_life = grf_load_byte(&buf);
break; 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: default:
ret = true; ret = true;
break; break;

14
src/newgrf_callbacks.h
View File

@@ -170,7 +170,16 @@ enum CallbackID {
/** Called to determine if the industry can still accept or refuse more cargo arrival */ /** Called to determine if the industry can still accept or refuse more cargo arrival */
CBID_INDUSTRY_REFUSE_CARGO = 0x3D, CBID_INDUSTRY_REFUSE_CARGO = 0x3D,
/* There are no callbacks 0x3E - 0x142. */ /* There are no callbacks 0x3E - 0x13F */
/** Called for periodically starting or stopping the animation. */
CBID_STATION_ANIM_START_STOP = 0x140, // not implemented
/** Called to determine station tile next animation frame. */
CBID_STATION_ANIM_NEXT_FRAME = 0x141, // not implemented
/** Called to indicate how long the current animation frame should last. */
CBID_STATION_ANIMATION_SPEED = 0x142, // not implemented
/** Called to determine whether a town building can be destroyed. */ /** Called to determine whether a town building can be destroyed. */
CBID_HOUSE_DENY_DESTRUCTION = 0x143, CBID_HOUSE_DENY_DESTRUCTION = 0x143,
@@ -187,7 +196,8 @@ enum CallbackID {
/** Add an offset to the default sprite numbers to show another sprite. */ /** Add an offset to the default sprite numbers to show another sprite. */
CBID_CANALS_SPRITE_OFFSET = 0x147, // not implemented CBID_CANALS_SPRITE_OFFSET = 0x147, // not implemented
/* There is no callback 0x148.*/ /** Called when a cargo type specified in property 20 is accepted. */
CBID_HOUSE_WATCHED_CARGO_ACCEPTED = 0x148, // not implemented
/** Callback done for each tile of a station to check the slope. */ /** Callback done for each tile of a station to check the slope. */
CBID_STATION_LAND_SLOPE_CHECK = 0x149, // not implemented CBID_STATION_LAND_SLOPE_CHECK = 0x149, // not implemented