mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
This commit is contained in:
parent
bf98e25e43
commit
429521a7d1
|
@ -3,10 +3,10 @@
|
|||
#ifndef AI_H
|
||||
#define AI_H
|
||||
|
||||
#include "../functions.h"
|
||||
#include "../network/network.h"
|
||||
#include "../player.h"
|
||||
#include "../command_type.h"
|
||||
#include "../core/random_func.hpp"
|
||||
|
||||
/* How DoCommands look like for an AI */
|
||||
struct AICommand {
|
||||
|
|
|
@ -26,6 +26,8 @@
|
|||
#include "../../bridge.h"
|
||||
#include "../../date.h"
|
||||
#include "../../tunnelbridge_map.h"
|
||||
#include "../../window_func.h"
|
||||
#include "../../functions.h"
|
||||
#include "default.h"
|
||||
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
#include "../../stdafx.h"
|
||||
#include "../../openttd.h"
|
||||
#include "../../debug.h"
|
||||
#include "../../functions.h"
|
||||
#include "../../map.h"
|
||||
#include "../../road_map.h"
|
||||
#include "../../vehicle.h"
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#include "../../openttd.h"
|
||||
#include "../../bridge_map.h"
|
||||
#include "../../debug.h"
|
||||
#include "../../functions.h"
|
||||
#include "../../map.h"
|
||||
#include "../../command_func.h"
|
||||
#include "trolly.h"
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include "../../stdafx.h"
|
||||
#include "../../openttd.h"
|
||||
#include "../../debug.h"
|
||||
#include "../../functions.h"
|
||||
#include "../../road_map.h"
|
||||
#include "../../station_map.h"
|
||||
#include "table/strings.h"
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include "openttd.h"
|
||||
#include "aircraft.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "station_map.h"
|
||||
#include "table/strings.h"
|
||||
|
@ -33,6 +32,8 @@
|
|||
#include "cargotype.h"
|
||||
#include "strings_func.h"
|
||||
#include "command_func.h"
|
||||
#include "window_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
void Aircraft::UpdateDeltaXY(Direction direction)
|
||||
{
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "aircraft.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "map.h"
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "window_gui.h"
|
||||
#include "gui.h"
|
||||
|
@ -18,6 +17,7 @@
|
|||
#include "station.h"
|
||||
#include "airport.h"
|
||||
#include "depot.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static byte _selected_airport_type;
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "vehicle.h"
|
||||
#include "articulated_vehicles.h"
|
||||
#include "engine.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "roadveh.h"
|
||||
#include "ship.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "news.h"
|
||||
#include "player.h"
|
||||
#include "engine.h"
|
||||
|
@ -19,6 +18,7 @@
|
|||
#include "order.h"
|
||||
#include "strings_func.h"
|
||||
#include "command_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
/*
|
||||
* move the cargo from one engine to another if possible
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
|
@ -16,6 +15,7 @@
|
|||
#include "group.h"
|
||||
#include "rail.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static RailType _railtype_selected_in_replace_gui;
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "../stdafx.h"
|
||||
#include "../zoom_func.h"
|
||||
#include "../functions.h"
|
||||
#include "../core/random_func.hpp"
|
||||
#include "8bpp_debug.hpp"
|
||||
|
||||
static FBlitter_8bppDebug iFBlitter_8bppDebug;
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
|
@ -16,6 +15,7 @@
|
|||
#include "variables.h"
|
||||
#include "bridge.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static struct BridgeData {
|
||||
uint8 last_size;
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "ship.h"
|
||||
#include "aircraft.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
|
@ -29,6 +28,7 @@
|
|||
#include "group.h"
|
||||
#include "road_map.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
|
||||
enum BuildVehicleWidgets {
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include "clear_map.h"
|
||||
#include "rail_map.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "player.h"
|
||||
#include "viewport.h"
|
||||
|
@ -23,6 +22,8 @@
|
|||
#include "industry.h"
|
||||
#include "water_map.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "vehicle.h"
|
||||
#include "functions.h"
|
||||
|
||||
/*
|
||||
* In one terraforming command all four corners of a initial tile can be raised/lowered (though this is not available to the player).
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "map.h"
|
||||
#include "tile_map.h"
|
||||
|
@ -18,6 +17,7 @@
|
|||
#include "newgrf_storage.h"
|
||||
#include "strings_func.h"
|
||||
#include "gfx_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
const char *_cmd_text = NULL;
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "window_gui.h"
|
||||
|
@ -19,6 +18,7 @@
|
|||
#include "network/network_data.h"
|
||||
#include "network/network_server.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "window_func.h"
|
||||
|
||||
#define ICON_BUFFER 79
|
||||
#define ICON_HISTORY_SIZE 20
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include "console.h"
|
||||
#include "debug.h"
|
||||
#include "engine.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "saveload.h"
|
||||
#include "string.h"
|
||||
|
@ -28,6 +27,8 @@
|
|||
#include "network/network.h"
|
||||
#include "strings_func.h"
|
||||
#include "viewport.h"
|
||||
#include "window_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
// ** scriptfile handling ** //
|
||||
static FILE *_script_file;
|
||||
|
|
|
@ -10,8 +10,9 @@
|
|||
#include "network/network.h"
|
||||
#include "network/network_data.h"
|
||||
#include "network/network_server.h"
|
||||
#include "functions.h"
|
||||
#include "currency.h"
|
||||
#include "window_func.h"
|
||||
#include "functions.h"
|
||||
#ifdef DEBUG_DUMP_COMMANDS
|
||||
#include "saveload.h"
|
||||
#endif
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "openttd.h"
|
||||
#include "console.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "string.h"
|
||||
#include "network/core/core.h"
|
||||
|
||||
|
|
|
@ -129,4 +129,7 @@ const char *GetDebugString();
|
|||
}\
|
||||
}
|
||||
|
||||
void ShowInfo(const char *str);
|
||||
void CDECL ShowInfoF(const char *str, ...);
|
||||
|
||||
#endif /* DEBUG_H */
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
#include "openttd.h"
|
||||
#include "vehicle.h"
|
||||
#include "depot.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "map.h"
|
||||
#include "table/strings.h"
|
||||
#include "saveload.h"
|
||||
#include "order.h"
|
||||
#include "window_func.h"
|
||||
|
||||
DEFINE_OLD_POOL_GENERIC(Depot, Depot)
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "train.h"
|
||||
#include "roadveh.h"
|
||||
#include "ship.h"
|
||||
|
@ -22,6 +21,7 @@
|
|||
#include "newgrf_engine.h"
|
||||
#include "spritecache.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
/*
|
||||
* Since all depot window sizes aren't the same, we need to modify sizes a little.
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include "table/sprites.h"
|
||||
#include "date.h"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
enum DisasterSubType {
|
||||
ST_Zeppeliner,
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "tile_map.h"
|
||||
#include "station.h"
|
||||
|
@ -18,6 +17,7 @@
|
|||
#include "command_func.h"
|
||||
#include "variables.h"
|
||||
#include "water.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static void ShowBuildDockStationPicker();
|
||||
static void ShowBuildDocksDepotPicker();
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "driver.h"
|
||||
#include "functions.h"
|
||||
#include "string.h"
|
||||
|
||||
#include "sound/sound_driver.hpp"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "currency.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
|
@ -40,6 +39,8 @@
|
|||
#include "group.h"
|
||||
#include "strings_func.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
/**
|
||||
* Multiply two integer values and shift the results to right.
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
#include "openttd.h"
|
||||
#include "station_map.h"
|
||||
#include "viewport.h"
|
||||
#include "functions.h" /* We should REALLY get rid of this goddamn file, as it is butt-ugly */
|
||||
#include "variables.h" /* ... same here */
|
||||
#include "landscape.h"
|
||||
#include "rail_type.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "table/strings.h"
|
||||
#include "engine.h"
|
||||
#include "player.h"
|
||||
|
@ -24,6 +23,8 @@
|
|||
#include "misc/autoptr.hpp"
|
||||
#include "strings_func.h"
|
||||
#include "viewport.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
EngineInfo _engine_info[TOTAL_NUM_ENGINES];
|
||||
RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "functions.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "viewport.h"
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "fileio.h"
|
||||
#include "functions.h"
|
||||
#include "string.h"
|
||||
#include "variables.h"
|
||||
#include "debug.h"
|
||||
#include "fios.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "core/math_func.hpp"
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#else
|
||||
|
@ -764,3 +764,31 @@ void SanitizeFilename(char *filename)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
|
||||
{
|
||||
FILE *in;
|
||||
byte *mem;
|
||||
size_t len;
|
||||
|
||||
in = fopen(filename, "rb");
|
||||
if (in == NULL) return NULL;
|
||||
|
||||
fseek(in, 0, SEEK_END);
|
||||
len = ftell(in);
|
||||
fseek(in, 0, SEEK_SET);
|
||||
if (len > maxsize || (mem = MallocT<byte>(len + 1)) == NULL) {
|
||||
fclose(in);
|
||||
return NULL;
|
||||
}
|
||||
mem[len] = 0;
|
||||
if (fread(mem, len, 1, in) != 1) {
|
||||
fclose(in);
|
||||
free(mem);
|
||||
return NULL;
|
||||
}
|
||||
fclose(in);
|
||||
|
||||
*lenp = len;
|
||||
return mem;
|
||||
}
|
||||
|
|
|
@ -112,6 +112,8 @@ static inline const char *FioGetSubdirectory(Subdirectory subdir)
|
|||
void SanitizeFilename(char *filename);
|
||||
void AppendPathSeparator(char *buf, size_t buflen);
|
||||
void DeterminePaths(const char *exe);
|
||||
void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize);
|
||||
bool FileExists(const char *filename);
|
||||
|
||||
extern char *_personal_dir; ///< custom directory for personal settings, saves, newgrf, etc.
|
||||
|
||||
|
|
|
@ -8,12 +8,12 @@
|
|||
#include "openttd.h"
|
||||
#include "string.h"
|
||||
#include "variables.h"
|
||||
#include "functions.h"
|
||||
#include "heightmap.h"
|
||||
#include "table/strings.h"
|
||||
#include "fios.h"
|
||||
#include "fileio.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "functions.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "debug.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/control_codes.h"
|
||||
|
@ -15,6 +14,7 @@
|
|||
#include "blitter/factory.hpp"
|
||||
#include "gfx_func.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "core/math_func.hpp"
|
||||
|
||||
#ifdef WITH_FREETYPE
|
||||
|
||||
|
|
|
@ -7,11 +7,8 @@
|
|||
|
||||
#include "core/random_func.hpp"
|
||||
#include "command_type.h"
|
||||
#include "window_type.h"
|
||||
#include "openttd.h"
|
||||
|
||||
void UpdateTownMaxPass(Town *t);
|
||||
|
||||
/* clear_land.cpp */
|
||||
void DrawHillyLandTile(const TileInfo *ti);
|
||||
void DrawClearLandTile(const TileInfo *ti, byte set);
|
||||
|
@ -25,10 +22,6 @@ void SubtractMoneyFromPlayerFract(PlayerID player, CommandCost cost);
|
|||
bool CheckOwnership(Owner owner);
|
||||
bool CheckTileOwnership(TileIndex tile);
|
||||
|
||||
/* standard */
|
||||
void ShowInfo(const char *str);
|
||||
void CDECL ShowInfoF(const char *str, ...);
|
||||
|
||||
/* openttd.cpp */
|
||||
static inline TileIndex RandomTileSeed(uint32 r) { return TILE_MASK(r); }
|
||||
static inline TileIndex RandomTile() { return TILE_MASK(Random()); }
|
||||
|
@ -67,14 +60,6 @@ void MarkTileDirty(int x, int y);
|
|||
* @ingroup dirty
|
||||
*/
|
||||
void MarkTileDirtyByTile(TileIndex tile);
|
||||
void InvalidateWindow(WindowClass cls, WindowNumber number);
|
||||
void InvalidateWindowWidget(WindowClass cls, WindowNumber number, byte widget_index);
|
||||
void InvalidateWindowClasses(WindowClass cls);
|
||||
void InvalidateWindowClassesData(WindowClass cls);
|
||||
void DeleteWindowById(WindowClass cls, WindowNumber number);
|
||||
void DeleteWindowByClass(WindowClass cls);
|
||||
|
||||
bool EnsureNoVehicleOnGround(TileIndex tile);
|
||||
|
||||
/**
|
||||
* Mark all viewports dirty for repaint.
|
||||
|
@ -85,15 +70,8 @@ void MarkAllViewportsDirty(int left, int top, int right, int bottom);
|
|||
void ShowCostOrIncomeAnimation(int x, int y, int z, Money cost);
|
||||
void ShowFeederIncomeAnimation(int x, int y, int z, Money cost);
|
||||
|
||||
bool CheckIfAuthorityAllows(TileIndex tile);
|
||||
Town *ClosestTownFromTile(TileIndex tile, uint threshold);
|
||||
void ChangeTownRating(Town *t, int add, int max);
|
||||
|
||||
uint GetTownRadiusGroup(const Town* t, TileIndex tile);
|
||||
void ShowHighscoreTable(int difficulty, int8 rank);
|
||||
|
||||
void AfterLoadTown();
|
||||
void UpdatePatches();
|
||||
void AskExitGame();
|
||||
void AskExitToGameMenu();
|
||||
|
||||
|
@ -115,13 +93,8 @@ void ShowSaveLoadDialog(int mode);
|
|||
|
||||
/* callback from drivers that is called if the game size changes dynamically */
|
||||
void GameSizeChanged();
|
||||
bool FileExists(const char *filename);
|
||||
const char *GetCurrentLocale(const char *param);
|
||||
void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize);
|
||||
|
||||
void LoadFromConfig();
|
||||
void SaveToConfig();
|
||||
void CheckConfig();
|
||||
int ttd_main(int argc, char* argv[]);
|
||||
void HandleExitGameRequest();
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "player.h"
|
||||
#include "table/sprites.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "heightmap.h"
|
||||
#include "functions.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "gui.h"
|
||||
|
@ -25,6 +24,7 @@
|
|||
#include "date.h"
|
||||
#include "newgrf_config.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
/**
|
||||
* In what 'mode' the GenerateLandscapeWindowProc is.
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "gfx_func.h"
|
||||
#include "spritecache.h"
|
||||
#include "string.h"
|
||||
|
@ -20,6 +19,7 @@
|
|||
#include "blitter/factory.hpp"
|
||||
#include "video/video_driver.hpp"
|
||||
#include "strings_func.h"
|
||||
#include "core/math_func.hpp"
|
||||
|
||||
byte _dirkeys; ///< 1 = left, 2 = up, 4 = right, 8 = down
|
||||
bool _fullscreen;
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "gfxinit.h"
|
||||
#include "spritecache.h"
|
||||
#include "table/sprites.h"
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "functions.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "player.h"
|
||||
|
@ -16,6 +15,7 @@
|
|||
#include "cargotype.h"
|
||||
#include "strings_func.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "window_func.h"
|
||||
|
||||
/* Bitmasks of player and cargo indices that shouldn't be drawn. */
|
||||
static uint _legend_excluded_players;
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "variables.h"
|
||||
#include "functions.h"
|
||||
#include "player.h"
|
||||
#include "table/strings.h"
|
||||
#include "command_func.h"
|
||||
|
@ -19,6 +18,8 @@
|
|||
#include "vehicle_gui.h"
|
||||
#include "misc/autoptr.hpp"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
/**
|
||||
* Update the num engines of a groupID. Decrease the old one and increase the new one
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "gui.h"
|
||||
|
@ -22,6 +21,7 @@
|
|||
#include "debug.h"
|
||||
#include "strings_func.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "window_func.h"
|
||||
|
||||
|
||||
struct Sorting {
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include "window_type.h"
|
||||
#include "vehicle_type.h"
|
||||
#include "gfx_type.h"
|
||||
#include "economy_type.h"
|
||||
|
||||
/* main_gui.cpp */
|
||||
void CcPlaySound10(bool success, TileIndex tile, uint32 p1, uint32 p2);
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "variables.h"
|
||||
#include "functions.h"
|
||||
#include "heightmap.h"
|
||||
#include "clear_map.h"
|
||||
#include "table/strings.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "clear_map.h"
|
||||
#include "functions.h"
|
||||
#include "industry_map.h"
|
||||
#include "station_map.h"
|
||||
#include "table/strings.h"
|
||||
|
@ -40,6 +39,8 @@
|
|||
#include "water.h"
|
||||
#include "strings_func.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
void ShowIndustryViewWindow(int industry);
|
||||
void BuildOilRig(TileIndex tile);
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "map.h"
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "functions.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
|
@ -19,6 +18,8 @@
|
|||
#include "network/network_gui.h"
|
||||
#include "newgrf.h"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static const Widget _select_game_widgets[] = {
|
||||
{ WWT_CAPTION, RESIZE_NONE, 13, 0, 335, 0, 13, STR_0307_OPENTTD, STR_NULL},
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "heightmap.h"
|
||||
#include "clear_map.h"
|
||||
#include "date.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "player.h"
|
||||
#include "spritecache.h"
|
||||
|
@ -23,6 +22,9 @@
|
|||
#include "genworld.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
extern const TileTypeProcs
|
||||
_tile_type_clear_procs,
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "heightmap.h"
|
||||
#include "currency.h"
|
||||
#include "functions.h"
|
||||
#include "spritecache.h"
|
||||
#include "station.h"
|
||||
#include "table/sprites.h"
|
||||
|
@ -42,6 +41,7 @@
|
|||
#include "newgrf_config.h"
|
||||
#include "rail_gui.h"
|
||||
#include "road_gui.h"
|
||||
#include "functions.h"
|
||||
|
||||
#include "network/network_data.h"
|
||||
#include "network/network_client.h"
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "direction_func.h"
|
||||
#include "core/bitmath_func.hpp"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "core/math_func.hpp"
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1400 /* VStudio 2005 is stupid! */
|
||||
/* Why the hell is that not in all MSVC headers?? */
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "currency.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "news.h"
|
||||
#include "player.h"
|
||||
|
@ -26,6 +25,7 @@
|
|||
#include "viewport.h"
|
||||
#include "economy_func.h"
|
||||
#include "zoom_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
char _name_array[512][32];
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "string.h"
|
||||
#include "table/strings.h"
|
||||
#include "command_func.h"
|
||||
|
@ -20,6 +19,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "gfx_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
/** Change the player's face.
|
||||
* @param tile unused
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "heightmap.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "newgrf.h"
|
||||
#include "newgrf_text.h"
|
||||
|
@ -41,6 +40,8 @@
|
|||
#include "fios.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "zoom_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
/* Variables to display file lists */
|
||||
FiosItem *_fios_list;
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "functions.h"
|
||||
#include "fileio.h"
|
||||
#include "sound.h"
|
||||
#include "variables.h"
|
||||
|
@ -14,6 +13,7 @@
|
|||
#include "music/music_driver.hpp"
|
||||
#include "window_gui.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static byte _music_wnd_cursong;
|
||||
static bool _song_is_active;
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "../../openttd.h"
|
||||
#include "../../variables.h"
|
||||
#include "table/strings.h"
|
||||
#include "../../functions.h"
|
||||
|
||||
#include "../network_data.h"
|
||||
#include "packet.h"
|
||||
|
|
|
@ -9,7 +9,6 @@ extern const char _openttd_revision[];
|
|||
|
||||
#include "../openttd.h"
|
||||
#include "../debug.h"
|
||||
#include "../functions.h"
|
||||
#include "../string.h"
|
||||
#include "../strings_func.h"
|
||||
#include "../map.h"
|
||||
|
@ -31,6 +30,8 @@ extern const char _openttd_revision[];
|
|||
#include "../md5.h"
|
||||
#include "../fileio.h"
|
||||
#include "../texteff.hpp"
|
||||
#include "../core/random_func.hpp"
|
||||
#include "../window_func.h"
|
||||
|
||||
/* Check whether NETWORK_NUM_LANDSCAPES is still in sync with NUM_LANDSCAPE */
|
||||
assert_compile((int)NETWORK_NUM_LANDSCAPES == (int)NUM_LANDSCAPE);
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "core/tcp.h"
|
||||
#include "../date.h"
|
||||
#include "table/strings.h"
|
||||
#include "../functions.h"
|
||||
#include "network_client.h"
|
||||
#include "network_gamelist.h"
|
||||
#include "network_gui.h"
|
||||
|
@ -23,6 +22,7 @@
|
|||
#include "../fileio.h"
|
||||
#include "../md5.h"
|
||||
#include "../strings_func.h"
|
||||
#include "../window_func.h"
|
||||
|
||||
// This file handles all the client-commands
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
#include "../fios.h"
|
||||
#include "table/strings.h"
|
||||
#include "../functions.h"
|
||||
#include "network_data.h"
|
||||
#include "network_client.h"
|
||||
#include "network_gui.h"
|
||||
|
@ -26,6 +25,8 @@
|
|||
#include "../string.h"
|
||||
#include "../town.h"
|
||||
#include "../newgrf.h"
|
||||
#include "../functions.h"
|
||||
#include "../window_func.h"
|
||||
|
||||
#define BGC 5
|
||||
#define BTC 15
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "../aircraft.h"
|
||||
#include "../date.h"
|
||||
#include "table/strings.h"
|
||||
#include "../functions.h"
|
||||
#include "network_server.h"
|
||||
#include "network_udp.h"
|
||||
#include "../console.h"
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "fileio.h"
|
||||
#include "functions.h"
|
||||
#include "engine.h"
|
||||
#include "spritecache.h"
|
||||
#include "station.h"
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "debug.h"
|
||||
#include "variables.h"
|
||||
#include "string.h"
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "variables.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "engine.h"
|
||||
#include "train.h"
|
||||
#include "player.h"
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
|
@ -14,6 +13,7 @@
|
|||
#include "newgrf.h"
|
||||
#include "newgrf_config.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
/** Parse an integerlist string and set each found value
|
||||
* @param p the string to be parsed. Each element in the list is seperated by a
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "debug.h"
|
||||
#include "viewport.h"
|
||||
|
@ -25,6 +24,7 @@
|
|||
#include "newgrf_sound.h"
|
||||
#include "newgrf_commons.h"
|
||||
#include "transparency.h"
|
||||
#include "functions.h"
|
||||
|
||||
static BuildingCounts _building_counts;
|
||||
static HouseClassMapping _class_mapping[HOUSE_CLASS_MAX];
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "landscape.h"
|
||||
#include "table/strings.h"
|
||||
|
@ -20,6 +19,7 @@
|
|||
#include "newgrf_text.h"
|
||||
#include "newgrf_town.h"
|
||||
#include "date.h"
|
||||
#include "window_func.h"
|
||||
|
||||
/* Since the industry IDs defined by the GRF file don't necessarily correlate
|
||||
* to those used by the game, the IDs used for overriding old industries must be
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "debug.h"
|
||||
#include "viewport.h"
|
||||
|
@ -23,6 +22,7 @@
|
|||
#include "table/strings.h"
|
||||
#include "sprite.h"
|
||||
#include "transparency.h"
|
||||
#include "functions.h"
|
||||
|
||||
static uint32 GetGRFParameter(IndustryGfx indtile_id, byte parameter)
|
||||
{
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
#include "town.h"
|
||||
#include "industry.h"
|
||||
#include "newgrf_storage.h"
|
||||
#include "core/bitmath_func.hpp"
|
||||
#include "gfx_type.h"
|
||||
|
||||
/**
|
||||
* Gets the value of a so-called newgrf "register".
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include "openttd.h"
|
||||
#include "variables.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "core/bitmath_func.hpp"
|
||||
#include "town.h"
|
||||
|
||||
/** This function implements the town variables that newGRF defines.
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
|
@ -17,6 +16,7 @@
|
|||
#include "string.h"
|
||||
#include "transparency.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
/** @file news_gui.cpp
|
||||
*
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "debug.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "bridge.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "npf.h"
|
||||
#include "aystar.h"
|
||||
|
@ -20,6 +19,7 @@
|
|||
#include "network/network.h"
|
||||
#include "water_map.h"
|
||||
#include "tunnelbridge_map.h"
|
||||
#include "functions.h"
|
||||
|
||||
static AyStar _npf_aystar;
|
||||
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "station_map.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "town.h"
|
||||
#include "industry.h"
|
||||
|
@ -25,6 +24,7 @@
|
|||
#include "ai/ai.h"
|
||||
#include "date.h"
|
||||
#include "zoom_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
enum {
|
||||
HEADER_SIZE = 49,
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "oldpool.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "bridge_map.h"
|
||||
#include "functions.h"
|
||||
#include "mixer.h"
|
||||
#include "spritecache.h"
|
||||
#include "gfxinit.h"
|
||||
|
@ -120,34 +119,6 @@ void CDECL ShowInfoF(const char *str, ...)
|
|||
}
|
||||
|
||||
|
||||
void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
|
||||
{
|
||||
FILE *in;
|
||||
byte *mem;
|
||||
size_t len;
|
||||
|
||||
in = fopen(filename, "rb");
|
||||
if (in == NULL) return NULL;
|
||||
|
||||
fseek(in, 0, SEEK_END);
|
||||
len = ftell(in);
|
||||
fseek(in, 0, SEEK_SET);
|
||||
if (len > maxsize || (mem = MallocT<byte>(len + 1)) == NULL) {
|
||||
fclose(in);
|
||||
return NULL;
|
||||
}
|
||||
mem[len] = 0;
|
||||
if (fread(mem, len, 1, in) != 1) {
|
||||
fclose(in);
|
||||
free(mem);
|
||||
return NULL;
|
||||
}
|
||||
fclose(in);
|
||||
|
||||
*lenp = len;
|
||||
return mem;
|
||||
}
|
||||
|
||||
extern const char _openttd_revision[];
|
||||
static void showhelp()
|
||||
{
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "airport.h"
|
||||
#include "vehicle.h"
|
||||
#include "depot.h"
|
||||
#include "functions.h"
|
||||
#include "table/strings.h"
|
||||
#include "waypoint.h"
|
||||
#include "command_func.h"
|
||||
|
@ -21,6 +20,8 @@
|
|||
#include "aircraft.h"
|
||||
#include "strings_func.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
DEFINE_OLD_POOL_GENERIC(Order, Order)
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "station_map.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
|
@ -26,6 +25,7 @@
|
|||
#include "cargotype.h"
|
||||
#include "order.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
|
||||
enum OrderWindowWidgets {
|
||||
ORDER_WIDGET_CLOSEBOX = 0,
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#include "../../openttd.h"
|
||||
#include "../../variables.h"
|
||||
#include "../../debug.h"
|
||||
#include "../../functions.h"
|
||||
#include "../../gfx_func.h"
|
||||
#include "../../fileio.h"
|
||||
#include "../../blitter/factory.hpp"
|
||||
|
|
|
@ -8,9 +8,10 @@
|
|||
#include "string.h"
|
||||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
#include "functions.h"
|
||||
#include "fileio.h"
|
||||
#include "fios.h" // opendir/readdir/closedir
|
||||
#include "functions.h"
|
||||
#include "core/random_func.hpp"
|
||||
|
||||
#include <dirent.h>
|
||||
#include <unistd.h>
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
#ifndef PLAYER_FACE_H
|
||||
#define PLAYER_FACE_H
|
||||
|
||||
#include "core/random_func.hpp"
|
||||
|
||||
/** The gender/race combinations that we have faces for */
|
||||
enum GenderEthnicity {
|
||||
GENDER_FEMALE = 0, ///< This bit set means a female, otherwise male
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
|
@ -26,6 +25,8 @@
|
|||
#include "network/network_gui.h"
|
||||
#include "player_face.h"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static void DoShowPlayerFinances(PlayerID player, bool show_small, bool show_stickied);
|
||||
static void DoSelectPlayerFace(PlayerID player, bool show_big);
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "engine.h"
|
||||
#include "functions.h"
|
||||
#include "string.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
|
@ -30,6 +29,7 @@
|
|||
#include "tile_map.h"
|
||||
#include "strings_func.h"
|
||||
#include "gfx_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
/**
|
||||
* Sets the local player and updates the patch settings that are set on a
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "landscape.h"
|
||||
#include "date.h"
|
||||
|
@ -26,6 +25,8 @@
|
|||
#include "newgrf_station.h"
|
||||
#include "train.h"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
#include "bridge_map.h"
|
||||
#include "rail_map.h"
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "rail_map.h"
|
||||
#include "road_map.h"
|
||||
#include "road_internal.h"
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
|
@ -20,6 +19,8 @@
|
|||
#include "station_map.h"
|
||||
//needed for catchments
|
||||
#include "station.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
|
||||
static void ShowRVStationPicker(RoadStop::Type rs);
|
||||
|
|
|
@ -37,6 +37,8 @@
|
|||
#include "cargotype.h"
|
||||
#include "strings_func.h"
|
||||
#include "tunnelbridge_map.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
|
||||
static const uint16 _roadveh_images[63] = {
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "roadveh.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "thread.h"
|
||||
|
@ -30,6 +29,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "gfx_func.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "functions.h"
|
||||
#include <list>
|
||||
|
||||
extern const uint16 SAVEGAME_VERSION = 83;
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "table/strings.h"
|
||||
#include "fileio.h"
|
||||
#include "viewport.h"
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "currency.h"
|
||||
#include "functions.h"
|
||||
#include "screenshot.h"
|
||||
#include "sound.h"
|
||||
#include "string.h"
|
||||
|
|
|
@ -91,4 +91,9 @@ void IConsoleListPatches();
|
|||
const SettingDesc *GetPatchFromName(const char *name, uint *i);
|
||||
bool SetPatchValue(uint index, const Patches *object, int32 value);
|
||||
|
||||
void LoadFromConfig();
|
||||
void SaveToConfig();
|
||||
void CheckConfig();
|
||||
void UpdatePatches();
|
||||
|
||||
#endif /* SETTINGS_H */
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "currency.h"
|
||||
#include "functions.h"
|
||||
#include "string.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
|
@ -24,6 +23,8 @@
|
|||
#include "date.h"
|
||||
#include "newgrf_townname.h"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static uint32 _difficulty_click_a;
|
||||
static uint32 _difficulty_click_b;
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "ship.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "landscape.h"
|
||||
#include "map.h"
|
||||
|
@ -34,6 +33,8 @@
|
|||
#include "spritecache.h"
|
||||
#include "misc/autoptr.hpp"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "ship.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "player.h"
|
||||
#include "signs.h"
|
||||
|
@ -17,6 +16,8 @@
|
|||
#include "strings_func.h"
|
||||
#include "viewport.h"
|
||||
#include "zoom_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
SignID _new_sign_id;
|
||||
uint _total_signs;
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "functions.h"
|
||||
#include "gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "window_gui.h"
|
||||
|
@ -17,6 +16,7 @@
|
|||
#include "command_func.h"
|
||||
#include "strings_func.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "window_func.h"
|
||||
|
||||
static const Sign **_sign_sort;
|
||||
static uint _num_sign_sort;
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "bridge_map.h"
|
||||
#include "clear_map.h"
|
||||
#include "industry_map.h"
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "landscape.h"
|
||||
#include "map.h"
|
||||
#include "mixer.h"
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
#include "../stdafx.h"
|
||||
#include "../openttd.h"
|
||||
#include "../driver.h"
|
||||
#include "../functions.h"
|
||||
#include "../mixer.h"
|
||||
#include "../core/alloc_func.hpp"
|
||||
#include "win32_s.h"
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
#include "variables.h"
|
||||
#include "string.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "spritecache.h"
|
||||
#include "table/sprites.h"
|
||||
#include "fileio.h"
|
||||
#include "spriteloader/grf.hpp"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "core/math_func.hpp"
|
||||
#ifdef WITH_PNG
|
||||
#include "spriteloader/png.hpp"
|
||||
#endif /* WITH_PNG */
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "bridge_map.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "station_map.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
|
@ -32,6 +31,8 @@
|
|||
#include "roadveh.h"
|
||||
#include "station_gui.h"
|
||||
#include "zoom_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
Station::Station(TileIndex tile)
|
||||
{
|
||||
|
|
|
@ -43,6 +43,8 @@
|
|||
#include "water.h"
|
||||
#include "station_gui.h"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
|
||||
DEFINE_OLD_POOL_GENERIC(Station, Station)
|
||||
DEFINE_OLD_POOL_GENERIC(RoadStop, RoadStop)
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue