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

(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.

Browse Source
This commit is contained in:
rubidium
2008-09-30 20:39:50 +00:00
parent cc1e761eda
commit 3b798599b6
158 changed files with 4661 additions and 4675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/disaster_cmd.cpp
View File

@@ -69,11 +69,11 @@ static void DisasterClearSquare(TileIndex tile)
switch (GetTileType(tile)) {
case MP_RAILWAY:
if (IsHumanPlayer(GetTileOwner(tile)) && !IsRailWaypoint(tile)) {
PlayerID p = _current_player;
_current_player = OWNER_WATER;
if (IsHumanCompany(GetTileOwner(tile)) && !IsRailWaypoint(tile)) {
CompanyID old_company = _current_company;
_current_company = OWNER_WATER;
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
_current_player = p;
_current_company = old_company;
/* update signals in buffer */
UpdateSignalsInBuffer();
@@ -81,10 +81,10 @@ static void DisasterClearSquare(TileIndex tile)
break;
case MP_HOUSE: {
PlayerID p = _current_player;
_current_player = OWNER_NONE;
CompanyID old_company = _current_company;
_current_company = OWNER_NONE;
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
_current_player = p;
_current_company = old_company;
break;
}
@@ -229,7 +229,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v)
if (IsValidTile(tile) &&
IsTileType(tile, MP_STATION) &&
IsAirport(tile) &&
IsHumanPlayer(GetTileOwner(tile))) {
IsHumanCompany(GetTileOwner(tile))) {
v->current_order.SetDestination(1);
v->age = 0;
@@ -253,7 +253,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v)
if (IsValidTile(tile) &&
IsTileType(tile, MP_STATION) &&
IsAirport(tile) &&
IsHumanPlayer(GetTileOwner(tile))) {
IsHumanCompany(GetTileOwner(tile))) {
st = GetStationByTile(tile);
CLRBITS(st->airport_flags, RUNWAY_IN_block);
}
@@ -294,7 +294,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v)
if (IsValidTile(tile) &&
IsTileType(tile, MP_STATION) &&
IsAirport(tile) &&
IsHumanPlayer(GetTileOwner(tile))) {
IsHumanCompany(GetTileOwner(tile))) {
st = GetStationByTile(tile);
SETBITS(st->airport_flags, RUNWAY_IN_block);
}
@@ -331,7 +331,7 @@ static void DisasterTick_Ufo(Vehicle *v)
v->current_order.SetDestination(1);
FOR_ALL_VEHICLES(u) {
if (u->type == VEH_ROAD && IsRoadVehFront(u) && IsHumanPlayer(u->owner)) {
if (u->type == VEH_ROAD && IsRoadVehFront(u) && IsHumanCompany(u->owner)) {
v->dest_tile = u->index;
v->age = 0;
return;
@@ -644,7 +644,7 @@ static void DisasterTick_Big_Ufo(Vehicle *v)
do {
if (IsTileType(tile, MP_RAILWAY) &&
IsPlainRailTile(tile) &&
IsHumanPlayer(GetTileOwner(tile))) {
IsHumanCompany(GetTileOwner(tile))) {
break;
}
tile = TILE_MASK(tile + 1);
@@ -773,7 +773,7 @@ static void Disaster_Zeppeliner_Init()
FOR_ALL_STATIONS(st) {
if (st->airport_tile != 0 &&
st->airport_type <= 1 &&
IsHumanPlayer(st->owner)) {
IsHumanCompany(st->owner)) {
x = (TileX(st->xy) + 2) * TILE_SIZE;
break;
}