diff options
| -rw-r--r-- | src/ai/default/default.cpp | 2 | ||||
| -rw-r--r-- | src/command.cpp | 6 | ||||
| -rw-r--r-- | src/company_cmd.cpp | 12 | ||||
| -rw-r--r-- | src/company_func.h | 2 | ||||
| -rw-r--r-- | src/company_gui.h | 2 | ||||
| -rw-r--r-- | src/rail.h | 2 | ||||
| -rw-r--r-- | src/vehicle.cpp | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index defa32ab2..4b20500de 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -293,7 +293,7 @@ static EngineID AiChooseTrainToReplaceWith(const Company *c, const Vehicle *v) return AiChooseTrainToBuild(v->u.rail.railtype, avail_money, 0, v->tile); } -static EngineID AiChooseShipToReplaceWith(const Company *p, const Vehicle *v) +static EngineID AiChooseShipToReplaceWith(const Company *c, const Vehicle *v) { /* Ships are not implemented in this (broken) AI */ return INVALID_ENGINE; diff --git a/src/command.cpp b/src/command.cpp index 2d725237c..4ed4b3d6e 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -590,10 +590,10 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, * @todo Rewrite (dedicated) server to something more than a dirty hack! */ if (_networking && !(cmd & CMD_NETWORK_COMMAND)) { - CompanyID pbck = _local_company; - if (_network_dedicated || (_network_server && pbck == COMPANY_SPECTATOR)) _local_company = COMPANY_FIRST; + CompanyID bck = _local_company; + if (_network_dedicated || (_network_server && bck == COMPANY_SPECTATOR)) _local_company = COMPANY_FIRST; NetworkSend_Command(tile, p1, p2, cmd, callback); - if (_network_dedicated || (_network_server && pbck == COMPANY_SPECTATOR)) _local_company = pbck; + if (_network_dedicated || (_network_server && bck == COMPANY_SPECTATOR)) _local_company = bck; _docommand_recursive = 0; _cmd_text = NULL; ClearStorageChanges(false); diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 53c2fb9dc..fba53f5d7 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -84,10 +84,10 @@ void SetLocalCompany(CompanyID new_company) /* Do not update the patches if we are in the intro GUI */ if (IsValidCompanyID(new_company) && _game_mode != GM_MENU) { - const Company *p = GetCompany(new_company); - _settings_client.gui.autorenew = p->engine_renew; - _settings_client.gui.autorenew_months = p->engine_renew_months; - _settings_client.gui.autorenew_money = p->engine_renew_money; + const Company *c = GetCompany(new_company); + _settings_client.gui.autorenew = c->engine_renew; + _settings_client.gui.autorenew_months = c->engine_renew_months; + _settings_client.gui.autorenew_money = c->engine_renew_money; InvalidateWindow(WC_GAME_OPTIONS, 0); } } @@ -106,9 +106,9 @@ uint16 GetDrawStringCompanyColor(CompanyID company) return (_colour_gradient[_company_colours[company]][4]) | IS_PALETTE_COLOR; } -void DrawCompanyIcon(CompanyID p, int x, int y) +void DrawCompanyIcon(CompanyID c, int x, int y) { - DrawSprite(SPR_PLAYER_ICON, COMPANY_SPRITE_COLOR(p), x, y); + DrawSprite(SPR_PLAYER_ICON, COMPANY_SPRITE_COLOR(c), x, y); } /** diff --git a/src/company_func.h b/src/company_func.h index 1546d5a77..a1134b996 100644 --- a/src/company_func.h +++ b/src/company_func.h @@ -43,7 +43,7 @@ struct HighScore { extern HighScore _highscore_table[5][5]; // 4 difficulty-settings (+ network); top 5 void SaveToHighScore(); void LoadFromHighScore(); -int8 SaveHighScoreValue(const Company *p); +int8 SaveHighScoreValue(const Company *c); int8 SaveHighScoreValueNetwork(); #endif /* COMPANY_FUNC_H */ diff --git a/src/company_gui.h b/src/company_gui.h index bdd93da08..0714123bf 100644 --- a/src/company_gui.h +++ b/src/company_gui.h @@ -8,7 +8,7 @@ #include "company_type.h" uint16 GetDrawStringCompanyColor(CompanyID company); -void DrawCompanyIcon(CompanyID p, int x, int y); +void DrawCompanyIcon(CompanyID c, int x, int y); void ShowCompanyStations(CompanyID company); void ShowCompanyFinances(CompanyID company); diff --git a/src/rail.h b/src/rail.h index 04d2aa74d..099b17727 100644 --- a/src/rail.h +++ b/src/rail.h @@ -238,7 +238,7 @@ RailType GetBestRailtype(const CompanyID company); * @param company the company to get the rail types for. * @return the rail types. */ -RailTypes GetCompanyRailtypes(const CompanyID p); +RailTypes GetCompanyRailtypes(const CompanyID c); /** * Reset all rail type information to its default values. diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 654368d0d..8813c8939 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -98,7 +98,7 @@ const uint32 _send_to_depot_proc_table[] = { DEFINE_OLD_POOL_GENERIC(Vehicle, Vehicle) /** Function to tell if a vehicle needs to be autorenewed - * @param *p The vehicle owner + * @param *c The vehicle owner * @return true if the vehicle is old enough for replacement */ bool Vehicle::NeedsAutorenewing(const Company *c) const |