mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
This commit is contained in:
parent
a7d54cf946
commit
8f0e68285b
|
@ -12,7 +12,6 @@
|
|||
#include "map.h"
|
||||
#include "gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "gfx.h"
|
||||
#include "engine.h"
|
||||
#include "viewport.h"
|
||||
#include "player.h"
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "gui.h"
|
||||
#include "station_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "sound.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
#include "../spritecache.h"
|
||||
#include "../spriteloader/spriteloader.hpp"
|
||||
#include "../zoom.hpp"
|
||||
|
||||
enum BlitterMode {
|
||||
BM_NORMAL,
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "command_func.h"
|
||||
#include "economy_func.h"
|
||||
#include "sound.h"
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include "gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "articulated_vehicles.h"
|
||||
#include "gfx.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "station.h"
|
||||
#include "command_func.h"
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "player.h"
|
||||
#include "variables.h"
|
||||
#include "string.h"
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include "date.h"
|
||||
#include "network/network.h"
|
||||
#include "strings_func.h"
|
||||
#include "viewport.h"
|
||||
|
||||
// ** scriptfile handling ** //
|
||||
static FILE *_script_file;
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
/* $Id$ */
|
||||
|
||||
/** @file geometry_type.hpp All geometry types in OpenTTD. */
|
||||
|
||||
#ifndef GEOMETRY_TYPE_HPP
|
||||
#define GEOMETRY_TYPE_HPP
|
||||
|
||||
struct Point {
|
||||
int x;
|
||||
int y;
|
||||
};
|
||||
|
||||
struct Dimension {
|
||||
int width;
|
||||
int height;
|
||||
};
|
||||
|
||||
struct Rect {
|
||||
int left;
|
||||
int top;
|
||||
int right;
|
||||
int bottom;
|
||||
};
|
||||
|
||||
struct PointDimension {
|
||||
int x;
|
||||
int y;
|
||||
int width;
|
||||
int height;
|
||||
};
|
||||
|
||||
struct Pair {
|
||||
int a;
|
||||
int b;
|
||||
};
|
||||
|
||||
#endif /* GEOMETRY_TYPE_HPP */
|
|
@ -13,7 +13,6 @@
|
|||
#include "table/sprites.h"
|
||||
#include "gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "gfx.h"
|
||||
#include "landscape.h"
|
||||
|
||||
#include "industry_map.h"
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "window_gui.h"
|
||||
#include "station_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "sound.h"
|
||||
#include "command_func.h"
|
||||
#include "variables.h"
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "player.h"
|
||||
#include "station.h"
|
||||
#include "vehicle.h"
|
||||
#include "gfx.h"
|
||||
#include "command_func.h"
|
||||
#include "saveload.h"
|
||||
#include "industry.h"
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
#ifndef ECONOMY_FUNC_H
|
||||
#define ECONOMY_FUNC_H
|
||||
|
||||
#include "core/geometry_type.hpp"
|
||||
#include "economy_type.h"
|
||||
#include "cargo_type.h"
|
||||
#include "vehicle_type.h"
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "functions.h"
|
||||
#include "table/strings.h"
|
||||
#include "engine.h"
|
||||
#include "gfx.h"
|
||||
#include "player.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
|
@ -24,6 +23,7 @@
|
|||
#include "string.h"
|
||||
#include "misc/autoptr.hpp"
|
||||
#include "strings_func.h"
|
||||
#include "viewport.h"
|
||||
|
||||
EngineInfo _engine_info[TOTAL_NUM_ENGINES];
|
||||
RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "engine.h"
|
||||
#include "command_func.h"
|
||||
#include "economy_func.h"
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "table/sprites.h"
|
||||
#include "table/control_codes.h"
|
||||
#include "spritecache.h"
|
||||
#include "gfx.h"
|
||||
#include "string.h"
|
||||
#include "fontcache.h"
|
||||
#include "helpers.hpp"
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
#ifndef FONTCACHE_H
|
||||
#define FONTCACHE_H
|
||||
|
||||
#include "gfx.h"
|
||||
|
||||
/** Get the SpriteID mapped to the given font size and key */
|
||||
SpriteID GetUnicodeGlyph(FontSize size, uint32 key);
|
||||
|
||||
|
|
|
@ -5,10 +5,9 @@
|
|||
#ifndef FUNCTIONS_H
|
||||
#define FUNCTIONS_H
|
||||
|
||||
#include "gfx.h"
|
||||
#include "viewport.h"
|
||||
#include "core/random_func.hpp"
|
||||
#include "command_type.h"
|
||||
#include "window_type.h"
|
||||
|
||||
void UpdateTownMaxPass(Town *t);
|
||||
|
||||
|
@ -74,15 +73,6 @@ void InvalidateWindowClassesData(WindowClass cls);
|
|||
void DeleteWindowById(WindowClass cls, WindowNumber number);
|
||||
void DeleteWindowByClass(WindowClass cls);
|
||||
|
||||
void SetObjectToPlaceWnd(CursorID icon, SpriteID pal, ViewportHighlightMode mode, Window *w);
|
||||
void SetObjectToPlace(CursorID icon, SpriteID pal, ViewportHighlightMode mode, WindowClass window_class, WindowNumber window_num);
|
||||
|
||||
void ResetObjectToPlace();
|
||||
|
||||
bool ScrollWindowTo(int x, int y, Window *w, bool instant = false);
|
||||
|
||||
bool ScrollMainWindowToTile(TileIndex tile, bool instant = false);
|
||||
bool ScrollMainWindowTo(int x, int y, bool instant = false);
|
||||
bool EnsureNoVehicleOnGround(TileIndex tile);
|
||||
|
||||
/**
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "thread.h"
|
||||
#include "command_func.h"
|
||||
#include "genworld.h"
|
||||
#include "gfx.h"
|
||||
#include "gfxinit.h"
|
||||
#include "window_func.h"
|
||||
#include "network/network.h"
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "gfxinit.h"
|
||||
#include "player.h"
|
||||
#include "command_func.h"
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "gfx.h"
|
||||
#include "spritecache.h"
|
||||
#include "string.h"
|
||||
#include "gfx.h"
|
||||
#include "table/palettes.h"
|
||||
#include "table/sprites.h"
|
||||
#include "variables.h"
|
||||
|
@ -514,16 +514,16 @@ uint DrawStringMultiLine(int x, int y, StringID str, int maxw, int maxh)
|
|||
}
|
||||
|
||||
/** Return the string dimension in pixels. The height and width are returned
|
||||
* in a single BoundingRect value. TINYFONT, BIGFONT modifiers are only
|
||||
* in a single Dimension value. TINYFONT, BIGFONT modifiers are only
|
||||
* supported as the first character of the string. The returned dimensions
|
||||
* are therefore a rough estimation correct for all the current strings
|
||||
* but not every possible combination
|
||||
* @param str string to calculate pixel-width
|
||||
* @return string width and height in pixels */
|
||||
BoundingRect GetStringBoundingBox(const char *str)
|
||||
Dimension GetStringBoundingBox(const char *str)
|
||||
{
|
||||
FontSize size = _cur_fontsize;
|
||||
BoundingRect br;
|
||||
Dimension br;
|
||||
int max_width;
|
||||
WChar c;
|
||||
|
||||
|
|
27
src/gfx.h
27
src/gfx.h
|
@ -37,6 +37,8 @@
|
|||
|
||||
#include "openttd.h"
|
||||
#include "core/math_func.hpp"
|
||||
#include "core/geometry_type.hpp"
|
||||
#include "core/enum_type.hpp"
|
||||
#include "zoom.hpp"
|
||||
|
||||
enum WindowKeyCodes {
|
||||
|
@ -125,26 +127,10 @@ enum WindowKeyCodes {
|
|||
WKC_MINUS = 153, ///< - Minus
|
||||
};
|
||||
|
||||
enum GameModes {
|
||||
GM_MENU,
|
||||
GM_NORMAL,
|
||||
GM_EDITOR
|
||||
};
|
||||
|
||||
void GameLoop();
|
||||
|
||||
void CreateConsole();
|
||||
|
||||
typedef int32 CursorID;
|
||||
|
||||
struct Point {
|
||||
int x, y;
|
||||
};
|
||||
|
||||
struct Rect {
|
||||
int left,top,right,bottom;
|
||||
};
|
||||
|
||||
/** A single sprite of a list of animated cursors */
|
||||
struct AnimCursor {
|
||||
static const CursorID LAST = MAX_UVALUE(CursorID);
|
||||
|
@ -203,10 +189,6 @@ extern bool _right_button_down;
|
|||
extern bool _right_button_clicked;
|
||||
|
||||
extern DrawPixelInfo _screen;
|
||||
extern bool _exit_game;
|
||||
extern bool _networking; ///< are we in networking mode?
|
||||
extern byte _game_mode;
|
||||
extern byte _pause_game;
|
||||
|
||||
extern int _pal_first_dirty;
|
||||
extern int _pal_count_dirty;
|
||||
|
@ -229,15 +211,12 @@ void HandleExitGameRequest();
|
|||
void GameSizeChanged();
|
||||
void UndrawMouseCursor();
|
||||
|
||||
#include "helpers.hpp"
|
||||
|
||||
enum FontSize {
|
||||
FS_NORMAL,
|
||||
FS_SMALL,
|
||||
FS_LARGE,
|
||||
FS_END,
|
||||
};
|
||||
|
||||
DECLARE_POSTFIX_INCREMENT(FontSize);
|
||||
|
||||
void RedrawScreenRect(int left, int top, int right, int bottom);
|
||||
|
@ -281,7 +260,7 @@ void GfxFillRect(int left, int top, int right, int bottom, int color);
|
|||
void GfxDrawLine(int left, int top, int right, int bottom, int color);
|
||||
void DrawBox(int x, int y, int dx1, int dy1, int dx2, int dy2, int dx3, int dy3);
|
||||
|
||||
BoundingRect GetStringBoundingBox(const char *str);
|
||||
Dimension GetStringBoundingBox(const char *str);
|
||||
uint32 FormatStringLinebreaks(char *str, int maxw);
|
||||
void LoadStringWidthTable();
|
||||
void DrawStringMultiCenter(int x, int y, StringID str, int maxw);
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "gfx.h"
|
||||
#include "gfxinit.h"
|
||||
#include "spritecache.h"
|
||||
#include "table/sprites.h"
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "functions.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "player.h"
|
||||
#include "economy_func.h"
|
||||
#include "variables.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "vehicle.h"
|
||||
#include "command_func.h"
|
||||
#include "engine.h"
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#include "string.h"
|
||||
#include "window_type.h"
|
||||
#include "vehicle_type.h"
|
||||
#include "gfx.h"
|
||||
|
||||
/* main_gui.cpp */
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "void_map.h"
|
||||
#include "debug.h"
|
||||
#include "gfx.h"
|
||||
#include "gui.h"
|
||||
#include "saveload.h"
|
||||
#include "bmp.h"
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "command_func.h"
|
||||
#include "viewport.h"
|
||||
#include "industry.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "player.h"
|
||||
#include "network/network.h"
|
||||
#include "variables.h"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef LANDSCAPE_H
|
||||
#define LANDSCAPE_H
|
||||
|
||||
#include "gfx.h"
|
||||
#include "core/geometry_type.hpp"
|
||||
|
||||
enum {
|
||||
SNOW_LINE_MONTHS = 12,
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include "window_func.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "player.h"
|
||||
#include "command_func.h"
|
||||
#include "news.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "command_func.h"
|
||||
#include "economy_func.h"
|
||||
#include "player.h"
|
||||
#include "gfx.h"
|
||||
#include "gui.h"
|
||||
#include "window_func.h"
|
||||
#include "textbuf_gui.h"
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "station_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "station.h"
|
||||
#include "command_func.h"
|
||||
#include "player.h"
|
||||
|
@ -728,7 +727,7 @@ static void TooltipsWndProc(Window *w, WindowEvent *e)
|
|||
void GuiShowTooltipsWithArgs(StringID str, uint paramcount, const uint64 params[])
|
||||
{
|
||||
char buffer[512];
|
||||
BoundingRect br;
|
||||
Dimension br;
|
||||
Window *w;
|
||||
uint i;
|
||||
int x, y;
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "table/sprites.h"
|
||||
#include "functions.h"
|
||||
#include "fileio.h"
|
||||
#include "gfx.h"
|
||||
#include "sound.h"
|
||||
#include "variables.h"
|
||||
#include "music.h"
|
||||
|
|
|
@ -216,6 +216,7 @@ void NetworkDisconnect();
|
|||
|
||||
bool IsNetworkCompatibleVersion(const char *version);
|
||||
|
||||
extern bool _networking; ///< are we in networking mode?
|
||||
VARDEF bool _network_server; ///< network-server is active
|
||||
VARDEF bool _network_available; ///< is network mode available?
|
||||
VARDEF bool _network_dedicated; ///< are we a dedicated server?
|
||||
|
@ -235,7 +236,7 @@ static inline void NetworkShutDown() {}
|
|||
|
||||
#endif /* ENABLE_NETWORK */
|
||||
|
||||
/* Thss variable must always be registered! */
|
||||
/* This variable must always be registered! */
|
||||
VARDEF PlayerID _network_playas; ///< an id to play as.. (see players.h:Players)
|
||||
|
||||
#endif /* NETWORK_H */
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "gfx.h"
|
||||
#include "fileio.h"
|
||||
#include "functions.h"
|
||||
#include "engine.h"
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "gfx.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "cargotype.h"
|
||||
#include "town_map.h"
|
||||
#include "newgrf_town.h"
|
||||
#include "gfx.h"
|
||||
|
||||
static StationClass station_classes[STAT_CLASS_MAX];
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "news.h"
|
||||
#include "vehicle.h"
|
||||
#include "sound.h"
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include "newgrf_config.h"
|
||||
#include "ai/ai.h"
|
||||
#include "date.h"
|
||||
#include "zoom.hpp"
|
||||
|
||||
enum {
|
||||
HEADER_SIZE = 49,
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include "functions.h"
|
||||
#include "mixer.h"
|
||||
#include "spritecache.h"
|
||||
#include "gfx.h"
|
||||
#include "gfxinit.h"
|
||||
#include "gui.h"
|
||||
#include "landscape.h"
|
||||
|
|
|
@ -11,21 +11,6 @@
|
|||
#include "helpers.hpp"
|
||||
#include "strings_type.h"
|
||||
|
||||
struct Oblong {
|
||||
int x, y;
|
||||
int width, height;
|
||||
};
|
||||
|
||||
struct BoundingRect {
|
||||
int width;
|
||||
int height;
|
||||
};
|
||||
|
||||
struct Pair {
|
||||
int a;
|
||||
int b;
|
||||
};
|
||||
|
||||
#include "map.h"
|
||||
#include "slope_type.h"
|
||||
|
||||
|
@ -46,6 +31,7 @@ struct PalSpriteID {
|
|||
SpriteID sprite;
|
||||
SpriteID pal;
|
||||
};
|
||||
typedef int32 CursorID;
|
||||
typedef uint16 EngineID;
|
||||
typedef uint16 UnitID;
|
||||
|
||||
|
@ -83,6 +69,12 @@ typedef int32 Date;
|
|||
|
||||
typedef uint32 PlayerFace; ///< player face bits, info see in player_face.h
|
||||
|
||||
enum GameModes {
|
||||
GM_MENU,
|
||||
GM_NORMAL,
|
||||
GM_EDITOR
|
||||
};
|
||||
|
||||
enum SwitchModes {
|
||||
SM_NONE = 0,
|
||||
SM_NEWGAME = 1,
|
||||
|
@ -282,4 +274,8 @@ enum ThreadMsg {
|
|||
|
||||
void OTTD_SendThreadMessage(ThreadMsg msg);
|
||||
|
||||
extern byte _game_mode;
|
||||
extern bool _exit_game;
|
||||
extern byte _pause_game;
|
||||
|
||||
#endif /* OPENTTD_H */
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "map.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "town.h"
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include "variables.h"
|
||||
#include "string.h"
|
||||
#include "table/strings.h"
|
||||
#include "gfx.h"
|
||||
#include "gui.h"
|
||||
#include "functions.h"
|
||||
#include "fileio.h"
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "engine.h"
|
||||
#include "livery.h"
|
||||
#include "genworld.h"
|
||||
#include "gfx.h"
|
||||
|
||||
struct PlayerEconomyEntry {
|
||||
Money income;
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "player.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "town.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "gfx.h"
|
||||
#include "news.h"
|
||||
#include "saveload.h"
|
||||
#include "command_func.h"
|
||||
|
@ -30,6 +29,7 @@
|
|||
#include "window_func.h"
|
||||
#include "tile_map.h"
|
||||
#include "strings_func.h"
|
||||
#include "gfx.h"
|
||||
|
||||
/**
|
||||
* Sets the local player and updates the patch settings that are set on a
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#ifndef RAIL_H
|
||||
#define RAIL_H
|
||||
|
||||
#include "gfx.h"
|
||||
#include "rail_type.h"
|
||||
#include "track_type.h"
|
||||
#include "vehicle_type.h"
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include "window_gui.h"
|
||||
#include "station_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "sound.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include "command_func.h"
|
||||
#include "player.h"
|
||||
#include "town.h"
|
||||
#include "gfx.h"
|
||||
#include "sound.h"
|
||||
#include "yapf/yapf.h"
|
||||
#include "depot.h"
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "window_gui.h"
|
||||
#include "station_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "sound.h"
|
||||
#include "command_func.h"
|
||||
#include "variables.h"
|
||||
|
|
|
@ -1100,7 +1100,6 @@ static void UninitNoComp()
|
|||
********************************************/
|
||||
|
||||
#include "table/sprites.h"
|
||||
#include "gfx.h"
|
||||
#include "gui.h"
|
||||
|
||||
struct ThreadedSave {
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "debug.h"
|
||||
#include "functions.h"
|
||||
#include "table/strings.h"
|
||||
#include "gfx.h"
|
||||
#include "fileio.h"
|
||||
#include "viewport.h"
|
||||
#include "player.h"
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
#include "window_func.h"
|
||||
#include "strings_func.h"
|
||||
#ifdef WITH_FREETYPE
|
||||
#include "gfx.h"
|
||||
#include "fontcache.h"
|
||||
#endif
|
||||
#include "spritecache.h"
|
||||
|
@ -1087,7 +1086,6 @@ static void ini_save_setting_list(IniFile *ini, const char *grpname, char **list
|
|||
/* Begin - Callback Functions for the various settings */
|
||||
#include "gui.h"
|
||||
#include "town.h"
|
||||
#include "gfx.h"
|
||||
/* virtual PositionMainToolbar function, calls the right one.*/
|
||||
static int32 v_PositionMainToolbar(int32 p1)
|
||||
{
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "command_func.h"
|
||||
#include "engine.h"
|
||||
#include "screenshot.h"
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "string.h"
|
||||
#include "misc/autoptr.hpp"
|
||||
#include "strings_func.h"
|
||||
#include "viewport.h"
|
||||
|
||||
SignID _new_sign_id;
|
||||
uint _total_signs;
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "gfx.h"
|
||||
#include "player.h"
|
||||
#include "signs.h"
|
||||
#include "debug.h"
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "window_gui.h"
|
||||
#include "tree_map.h"
|
||||
#include "tunnel_map.h"
|
||||
#include "gfx.h"
|
||||
#include "viewport.h"
|
||||
#include "player.h"
|
||||
#include "vehicle.h"
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "map.h"
|
||||
#include "station.h"
|
||||
#include "gfx.h"
|
||||
#include "viewport.h"
|
||||
#include "town.h"
|
||||
#include "vehicle.h"
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include "newgrf_station.h"
|
||||
#include "cargopacket.h"
|
||||
#include "cargo_type.h"
|
||||
#include "core/geometry_type.hpp"
|
||||
#include <list>
|
||||
#include <set>
|
||||
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "map.h"
|
||||
#include "station.h"
|
||||
#include "gfx.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "town.h"
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "station.h"
|
||||
#include "gfx.h"
|
||||
#include "player.h"
|
||||
#include "economy_func.h"
|
||||
#include "town.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "industry.h"
|
||||
#include "town.h"
|
||||
#include "player.h"
|
||||
#include "gfx.h"
|
||||
#include "economy_func.h"
|
||||
#include "variables.h"
|
||||
#include "date.h"
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "sound.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "functions.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "gfx.h"
|
||||
#include "landscape.h"
|
||||
#include "viewport.h"
|
||||
#include "saveload.h"
|
||||
|
@ -58,7 +57,7 @@ static bool _chatmessage_visible = false;
|
|||
|
||||
/* The chatbox grows from the bottom so the coordinates are pixels from
|
||||
* the left and pixels from the bottom. The height is the maximum height */
|
||||
static const Oblong _chatmsg_box = {10, 30, 500, 150};
|
||||
static const PointDimension _chatmsg_box = {10, 30, 500, 150};
|
||||
static uint8 _chatmessage_backup[150 * 500 * 6]; // (height * width)
|
||||
|
||||
static inline uint GetChatMessageCount()
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include "viewport.h"
|
||||
#include "town.h"
|
||||
#include "command_func.h"
|
||||
#include "gfx.h"
|
||||
#include "industry.h"
|
||||
#include "station.h"
|
||||
#include "vehicle.h"
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "town.h"
|
||||
#include "gfx.h"
|
||||
#include "viewport.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "gfx.h"
|
||||
#include "sound.h"
|
||||
#include "variables.h"
|
||||
#include "transparency.h"
|
||||
|
|
|
@ -6,11 +6,10 @@
|
|||
#define VARIABLES_H
|
||||
|
||||
#include "yapf/yapf_settings.h"
|
||||
#include "openttd.h"
|
||||
|
||||
/* ********* START OF SAVE REGION */
|
||||
|
||||
#include "gfx.h"
|
||||
|
||||
struct GameOptions {
|
||||
GameDifficulty diff;
|
||||
byte diff_level;
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include "map.h"
|
||||
#include "vehicle.h"
|
||||
#include "timetable.h"
|
||||
#include "gfx.h"
|
||||
#include "viewport.h"
|
||||
#include "news.h"
|
||||
#include "command_func.h"
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "command_func.h"
|
||||
#include "gfx.h"
|
||||
#include "variables.h"
|
||||
#include "vehicle_gui.h"
|
||||
#include "viewport.h"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "../sdl.h"
|
||||
#include "../variables.h"
|
||||
#include "../blitter/factory.hpp"
|
||||
#include "../network/network.h"
|
||||
#include "sdl_v.h"
|
||||
#include <SDL.h>
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include "../variables.h"
|
||||
#include "../win32.h"
|
||||
#include "../blitter/factory.hpp"
|
||||
#include "../network/network.h"
|
||||
#include "win32_v.h"
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include "viewport.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "gfx.h"
|
||||
#include "town.h"
|
||||
#include "signs.h"
|
||||
#include "waypoint.h"
|
||||
|
|
|
@ -168,4 +168,14 @@ extern TileHighlightData _thd;
|
|||
|
||||
void ViewportDoDraw(const ViewPort *vp, int left, int top, int right, int bottom);
|
||||
|
||||
void SetObjectToPlaceWnd(CursorID icon, SpriteID pal, ViewportHighlightMode mode, Window *w);
|
||||
void SetObjectToPlace(CursorID icon, SpriteID pal, ViewportHighlightMode mode, WindowClass window_class, WindowNumber window_num);
|
||||
|
||||
void ResetObjectToPlace();
|
||||
|
||||
bool ScrollWindowTo(int x, int y, Window *w, bool instant = false);
|
||||
|
||||
bool ScrollMainWindowToTile(TileIndex tile, bool instant = false);
|
||||
bool ScrollMainWindowTo(int x, int y, bool instant = false);
|
||||
|
||||
#endif /* VIEWPORT_H */
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
#include "command_func.h"
|
||||
#include "functions.h"
|
||||
#include "gfx.h"
|
||||
#include "landscape.h"
|
||||
#include "map.h"
|
||||
#include "order.h"
|
||||
|
@ -26,6 +25,7 @@
|
|||
#include "string.h"
|
||||
#include "misc/autoptr.hpp"
|
||||
#include "strings_func.h"
|
||||
#include "viewport.h"
|
||||
|
||||
enum {
|
||||
MAX_WAYPOINTS_PER_TOWN = 64,
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "player.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "gfx.h"
|
||||
#include "viewport.h"
|
||||
#include "window_gui.h"
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "helpers.hpp"
|
||||
#include "saveload.h"
|
||||
#include "string.h"
|
||||
#include "gfx.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "fileio.h"
|
||||
#include <windows.h>
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "functions.h"
|
||||
#include "map.h"
|
||||
#include "player.h"
|
||||
#include "gfx.h"
|
||||
#include "viewport.h"
|
||||
#include "console.h"
|
||||
#include "variables.h"
|
||||
|
|
Loading…
Reference in New Issue