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

(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h

Browse Source
This commit is contained in:
smatz
2007-12-16 15:38:51 +00:00
parent ec90ce7e98
commit 3cee0abdba
28 changed files with 245 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ai/default/default.cpp
View File

@@ -28,8 +28,10 @@
#include "../../bridge.h"
#include "../../date.h"
#include "../../helpers.hpp"
#include "../../tunnelbridge_map.h"
#include "default.h"
// remove some day perhaps?
static uint _ai_service_interval;
@@ -2233,7 +2235,7 @@ static bool AiRemoveTileAndGoForward(Player *p)
} else {
// Check if the bridge points in the right direction.
// This is not really needed the first place AiRemoveTileAndGoForward is called.
if (DiagDirToAxis(GetBridgeRampDirection(tile)) != (p->ai.cur_dir_a & 1)) return false;
if (DiagDirToAxis(GetTunnelBridgeDirection(tile)) != (p->ai.cur_dir_a & 1)) return false;
tile = GetOtherBridgeEnd(tile);
@@ -3733,13 +3735,13 @@ pos_3:
} else if (IsTileType(tile, MP_TUNNELBRIDGE)) {
if (!IsTileOwner(tile, _current_player) ||
!IsBridge(tile) ||
GetBridgeTransportType(tile) != TRANSPORT_RAIL) {
GetTunnelBridgeTransportType(tile) != TRANSPORT_RAIL) {
return;
}
rails = TRACK_BIT_NONE;
switch (GetBridgeRampDirection(tile)) {
switch (GetTunnelBridgeDirection(tile)) {
default:
case DIAGDIR_NE: goto pos_2;
case DIAGDIR_SE: goto pos_3;