mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r24602) [1.2] -Backport from trunk: 

- Fix: [NewGRF] Airport variables 60 to 65 and 69 used the wrong cargo translation table for translations (r24506)
- Fix: Do not show the global goals as company goals for spectators (r24500)
- Fix: Clarify description of command line option -n (r24485)
- Fix: Do not call RebuildSubsidisedSourceAndDestinationCache() before subsidy savegame conversion is finished [FS#5232] (r24482)
release/1.2
rubidium 2012-10-17 18:49:42 +00:00
parent 05f3b51703
commit 141a2f7ebc
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/goal_gui.cpp
View File

@ -190,7 +190,7 @@ struct GoalListWindow : Window {
num = 0; num = 0;
FOR_ALL_GOALS(s) { FOR_ALL_GOALS(s) {
if (s->company == _local_company) { if (s->company == _local_company && s->company != INVALID_COMPANY) {
if (IsInsideMM(pos, 0, cap)) { if (IsInsideMM(pos, 0, cap)) {
/* Display the goal */ /* Display the goal */
SetDParamStr(0, s->text); SetDParamStr(0, s->text);

2
src/newgrf_station.cpp
View File

@ -406,7 +406,7 @@ uint32 Station::GetNewGRFVariable(const ResolverObject *object, byte variable, b
/* Handle cargo variables with parameter, 0x60 to 0x65 and 0x69 */ /* Handle cargo variables with parameter, 0x60 to 0x65 and 0x69 */
if ((variable >= 0x60 && variable <= 0x65) || variable == 0x69) { if ((variable >= 0x60 && variable <= 0x65) || variable == 0x69) {
CargoID c = GetCargoTranslation(parameter, object->u.station.statspec->grf_prop.grffile); CargoID c = GetCargoTranslation(parameter, object->grffile);
if (c == CT_INVALID) return 0; if (c == CT_INVALID) return 0;
const GoodsEntry *ge = &this->goods[c]; const GoodsEntry *ge = &this->goods[c];

5
src/openttd.cpp
View File

@ -60,7 +60,7 @@
#include "game/game.hpp" #include "game/game.hpp"
#include "game/game_config.hpp" #include "game/game_config.hpp"
#include "town.h" #include "town.h"
#include "subsidy_func.h"
#include <stdarg.h> #include <stdarg.h>
@ -159,7 +159,7 @@ static void ShowHelp()
" -g [savegame] = Start new/save game immediately\n" " -g [savegame] = Start new/save game immediately\n"
" -G seed = Set random seed\n" " -G seed = Set random seed\n"
#if defined(ENABLE_NETWORK) #if defined(ENABLE_NETWORK)
" -n [ip:port#company]= Start networkgame\n" " -n [ip:port#company]= Join network game\n"
" -p password = Password to join server\n" " -p password = Password to join server\n"
" -P password = Password to join company\n" " -P password = Password to join company\n"
" -D [ip][:port] = Start dedicated server\n" " -D [ip][:port] = Start dedicated server\n"
@ -1155,6 +1155,7 @@ static void CheckCaches()
extern void RebuildTownCaches(); extern void RebuildTownCaches();
RebuildTownCaches(); RebuildTownCaches();
RebuildSubsidisedSourceAndDestinationCache();
uint i = 0; uint i = 0;
FOR_ALL_TOWNS(t) { FOR_ALL_TOWNS(t) {

2
src/saveload/town_sl.cpp
View File

@ -50,8 +50,6 @@ void RebuildTownCaches()
UpdateTownCargoes(town); UpdateTownCargoes(town);
} }
UpdateTownCargoBitmap(); UpdateTownCargoBitmap();
RebuildSubsidisedSourceAndDestinationCache();
} }
/** /**