From b8487afe5456d37efcc3bc622764715e7edbe6f3 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 19 Jul 2010 17:28:27 +0000 Subject: [PATCH] (svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :) --- projects/openttd_vs100.vcxproj | 1 - projects/openttd_vs100.vcxproj.filters | 3 --- projects/openttd_vs80.vcproj | 4 ---- projects/openttd_vs90.vcproj | 4 ---- source.list | 1 - src/clear_cmd.cpp | 1 - src/date.cpp | 1 - src/dedicated.cpp | 2 -- src/disaster_cmd.cpp | 1 - src/fileio.cpp | 1 - src/gamelog.cpp | 1 - src/genworld.cpp | 1 - src/genworld_gui.cpp | 1 - src/gfx.cpp | 1 - src/highscore.cpp | 1 - src/industry_cmd.cpp | 1 - src/industry_gui.cpp | 1 - src/landscape.cpp | 1 - src/misc.cpp | 1 - src/music/libtimidity.cpp | 1 - src/network/network_content.cpp | 1 - src/newgrf.cpp | 1 - src/newgrf_airporttiles.cpp | 1 - src/newgrf_house.cpp | 1 - src/newgrf_industrytiles.cpp | 1 - src/newgrf_railtype.cpp | 1 - src/newgrf_station.cpp | 1 - src/openttd.cpp | 5 ----- src/os/macosx/splash.cpp | 1 - src/os/os2/os2.cpp | 1 - src/rail_cmd.cpp | 1 - src/road_cmd.cpp | 1 - src/saveload/misc_sl.cpp | 1 - src/saveload/oldloader_sl.cpp | 1 - src/saveload/saveload.cpp | 1 - src/settings.cpp | 1 - src/station_cmd.cpp | 1 - src/terraform_cmd.cpp | 1 - src/terraform_gui.cpp | 1 - src/toolbar_gui.cpp | 1 - src/town_cmd.cpp | 1 - src/town_gui.cpp | 1 - src/tree_cmd.cpp | 1 - src/tunnelbridge_cmd.cpp | 1 - src/variables.h | 19 ------------------- src/video/allegro_v.cpp | 1 - src/video/cocoa/cocoa_v.mm | 1 - src/video/cocoa/event.mm | 1 - src/video/dedicated_v.cpp | 1 - src/video/sdl_v.cpp | 1 - src/video/win32_v.cpp | 1 - src/viewport.cpp | 1 - src/window.cpp | 1 - 53 files changed, 84 deletions(-) delete mode 100644 src/variables.h diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj index 6fdf426ac1..93efda8949 100644 --- a/projects/openttd_vs100.vcxproj +++ b/projects/openttd_vs100.vcxproj @@ -578,7 +578,6 @@ - diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters index e063b737a4..4aa8f28190 100644 --- a/projects/openttd_vs100.vcxproj.filters +++ b/projects/openttd_vs100.vcxproj.filters @@ -937,9 +937,6 @@ Header Files - - Header Files - Header Files diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index febd17297b..b6697d7508 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -1579,10 +1579,6 @@ RelativePath=".\..\src\unmovable.h" > - - diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index e21534b4fc..a0c31ce147 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1576,10 +1576,6 @@ RelativePath=".\..\src\unmovable.h" > - - diff --git a/source.list b/source.list index 412a2c1a44..30b6a8aae2 100644 --- a/source.list +++ b/source.list @@ -304,7 +304,6 @@ transparency_gui.h transport_type.h tunnelbridge.h unmovable.h -variables.h vehicle_base.h vehicle_func.h vehicle_gui.h diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp index e417c50535..fafd903711 100644 --- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -14,7 +14,6 @@ #include "clear_map.h" #include "command_func.h" #include "landscape.h" -#include "variables.h" #include "genworld.h" #include "landscape_type.h" #include "functions.h" diff --git a/src/date.cpp b/src/date.cpp index 4b9a49f6dc..3c29eaf823 100644 --- a/src/date.cpp +++ b/src/date.cpp @@ -10,7 +10,6 @@ /** @file date.cpp Handling of dates in our native format and transforming them to something human readable. */ #include "stdafx.h" -#include "variables.h" #include "network/network.h" #include "network/network_func.h" #include "currency.h" diff --git a/src/dedicated.cpp b/src/dedicated.cpp index 1de4d3a498..ca7e341d71 100644 --- a/src/dedicated.cpp +++ b/src/dedicated.cpp @@ -17,8 +17,6 @@ char *_log_file; ///< File to reroute output of a forked OpenTTD to #if defined(UNIX) && !defined(__MORPHOS__) -#include "variables.h" - #include #if (defined(SUNOS) && !defined(_LP64) && !defined(_I32LPx)) || defined(__HAIKU__) diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp index 31227b3bd9..c0c8384568 100644 --- a/src/disaster_cmd.cpp +++ b/src/disaster_cmd.cpp @@ -32,7 +32,6 @@ #include "news_func.h" #include "town.h" #include "company_func.h" -#include "variables.h" #include "strings_func.h" #include "date_func.h" #include "functions.h" diff --git a/src/fileio.cpp b/src/fileio.cpp index f1f8faae17..33a4e39761 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "fileio_func.h" -#include "variables.h" #include "debug.h" #include "fios.h" #include "string_func.h" diff --git a/src/gamelog.cpp b/src/gamelog.cpp index 7d827a3797..b1102dff8b 100644 --- a/src/gamelog.cpp +++ b/src/gamelog.cpp @@ -13,7 +13,6 @@ #include "openttd.h" #include "saveload/saveload.h" #include "core/alloc_func.hpp" -#include "variables.h" #include "string_func.h" #include "settings_type.h" #include "gamelog_internal.h" diff --git a/src/genworld.cpp b/src/genworld.cpp index b4cab558b6..2ed8836a32 100644 --- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -13,7 +13,6 @@ #include "openttd.h" #include "landscape.h" #include "company_func.h" -#include "variables.h" #include "thread/thread.h" #include "command_func.h" #include "genworld.h" diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index fda190de89..692fe5c1f3 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "openttd.h" #include "heightmap.h" -#include "variables.h" #include "debug.h" #include "genworld.h" #include "network/network.h" diff --git a/src/gfx.cpp b/src/gfx.cpp index 44d44a757a..e394ad64b2 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "gfx_func.h" -#include "variables.h" #include "fontcache.h" #include "genworld.h" #include "zoom_func.h" diff --git a/src/highscore.cpp b/src/highscore.cpp index beb4d13568..1c79d44fad 100644 --- a/src/highscore.cpp +++ b/src/highscore.cpp @@ -18,7 +18,6 @@ #include "strings_func.h" #include "table/strings.h" #include "core/sort_func.hpp" -#include "variables.h" #include "debug.h" HighScore _highscore_table[5][5]; // 4 difficulty-settings (+ network); top 5 diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 1c72f6e4cf..b9508084e4 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -19,7 +19,6 @@ #include "command_func.h" #include "town.h" #include "news_func.h" -#include "variables.h" #include "cheat_type.h" #include "genworld.h" #include "tree_map.h" diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index adfb8bd20d..c21264064c 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -18,7 +18,6 @@ #include "gfx_func.h" #include "industry.h" #include "town.h" -#include "variables.h" #include "cheat_type.h" #include "newgrf.h" #include "newgrf_industries.h" diff --git a/src/landscape.cpp b/src/landscape.cpp index 5352a6467c..ea31994223 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -18,7 +18,6 @@ #include "viewport_func.h" #include "command_func.h" #include "landscape.h" -#include "variables.h" #include "void_map.h" #include "tgp.h" #include "genworld.h" diff --git a/src/misc.cpp b/src/misc.cpp index b27966ec00..34d46fbca8 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "landscape.h" #include "news_func.h" -#include "variables.h" #include "ai/ai.hpp" #include "ai/ai_gui.hpp" #include "newgrf_house.h" diff --git a/src/music/libtimidity.cpp b/src/music/libtimidity.cpp index db456fc5a8..82f011c237 100644 --- a/src/music/libtimidity.cpp +++ b/src/music/libtimidity.cpp @@ -12,7 +12,6 @@ #include "../stdafx.h" #include "../openttd.h" #include "../sound_type.h" -#include "../variables.h" #include "../debug.h" #include "libtimidity.h" #include diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp index a7032a60fc..d10353bfd0 100644 --- a/src/network/network_content.cpp +++ b/src/network/network_content.cpp @@ -16,7 +16,6 @@ #include "../ai/ai.hpp" #include "../window_func.h" #include "../gui.h" -#include "../variables.h" #include "../base_media_base.h" #include "../settings_type.h" #include "network_content.h" diff --git a/src/newgrf.cpp b/src/newgrf.cpp index b7eb461a9e..2f8560c3cd 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -17,7 +17,6 @@ #include "fileio_func.h" #include "engine_func.h" #include "engine_base.h" -#include "variables.h" #include "bridge.h" #include "town.h" #include "newgrf_engine.h" diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp index 6b239c1a73..9fc2b960c2 100644 --- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -23,7 +23,6 @@ #include "landscape.h" #include "company_base.h" #include "town.h" -#include "variables.h" #include "functions.h" #include "core/random_func.hpp" #include "table/strings.h" diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index c3a309c335..b0f391606d 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -10,7 +10,6 @@ /** @file newgrf_house.cpp Implementation of NewGRF houses. */ #include "stdafx.h" -#include "variables.h" #include "debug.h" #include "viewport_func.h" #include "landscape.h" diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp index 479f51ede6..2e5b404f89 100644 --- a/src/newgrf_industrytiles.cpp +++ b/src/newgrf_industrytiles.cpp @@ -10,7 +10,6 @@ /** @file newgrf_industrytiles.cpp NewGRF handling of industry tiles. */ #include "stdafx.h" -#include "variables.h" #include "debug.h" #include "viewport_func.h" #include "landscape.h" diff --git a/src/newgrf_railtype.cpp b/src/newgrf_railtype.cpp index a0d66ec03b..cb020d902e 100644 --- a/src/newgrf_railtype.cpp +++ b/src/newgrf_railtype.cpp @@ -4,7 +4,6 @@ #include "stdafx.h" #include "openttd.h" -#include "variables.h" #include "debug.h" #include "strings_type.h" #include "rail.h" diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index df1d0a5671..5fb4d587dd 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -10,7 +10,6 @@ /** @file newgrf_station.cpp Functions for dealing with station classes and custom stations. */ #include "stdafx.h" -#include "variables.h" #include "debug.h" #include "station_base.h" #include "waypoint_base.h" diff --git a/src/openttd.cpp b/src/openttd.cpp index c17d15652b..67553349ae 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -11,11 +11,6 @@ #include "stdafx.h" -#define VARDEF -#include "variables.h" -#undef VARDEF - - #include "blitter/factory.hpp" #include "sound/sound_driver.hpp" #include "music/music_driver.hpp" diff --git a/src/os/macosx/splash.cpp b/src/os/macosx/splash.cpp index c9861c3120..6d8bf2f1f7 100644 --- a/src/os/macosx/splash.cpp +++ b/src/os/macosx/splash.cpp @@ -11,7 +11,6 @@ #include "../../stdafx.h" #include "../../openttd.h" -#include "../../variables.h" #include "../../debug.h" #include "../../gfx_func.h" #include "../../fileio_func.h" diff --git a/src/os/os2/os2.cpp b/src/os/os2/os2.cpp index ead6f78c3f..82693bd486 100644 --- a/src/os/os2/os2.cpp +++ b/src/os/os2/os2.cpp @@ -11,7 +11,6 @@ #include "../../stdafx.h" #include "../../openttd.h" -#include "../../variables.h" #include "../../gui.h" #include "../../fileio_func.h" #include "../../fios.h" diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 70a5a43252..eedfe7546f 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -23,7 +23,6 @@ #include "newgrf_railtype.h" #include "newgrf_commons.h" #include "train.h" -#include "variables.h" #include "autoslope.h" #include "water.h" #include "tunnelbridge_map.h" diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 6549f2047b..4b82d8eb7b 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -18,7 +18,6 @@ #include "pathfinder/yapf/yapf_cache.h" #include "depot_base.h" #include "newgrf.h" -#include "variables.h" #include "autoslope.h" #include "tunnelbridge_map.h" #include "window_func.h" diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp index 96b1f61afe..abe4d411ab 100644 --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../date_func.h" -#include "../variables.h" #include "../openttd.h" #include "../zoom_func.h" #include "../vehicle_func.h" diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index b1789e4a2a..0bef6045a8 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -24,7 +24,6 @@ #include "../depot_base.h" #include "../date_func.h" #include "../vehicle_func.h" -#include "../variables.h" #include "../effectvehicle_base.h" #include "../core/mem_func.hpp" #include "../core/alloc_type.hpp" diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index ac84dd9a26..c447031572 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -26,7 +26,6 @@ #include "../thread/thread.h" #include "../town.h" #include "../network/network.h" -#include "../variables.h" #include "../window_func.h" #include "../strings_func.h" #include "../core/endian_func.hpp" diff --git a/src/settings.cpp b/src/settings.cpp index 0f2ab8a6cb..b2bbd36226 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -25,7 +25,6 @@ #include "stdafx.h" #include "currency.h" #include "screenshot.h" -#include "variables.h" #include "network/network.h" #include "network/network_func.h" #include "settings_internal.h" diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 5e0d478ead..3f7b9f1c69 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -26,7 +26,6 @@ #include "newgrf_station.h" #include "pathfinder/yapf/yapf_cache.h" #include "road_internal.h" /* For drawing catenary/checking road removal */ -#include "variables.h" #include "autoslope.h" #include "water.h" #include "station_gui.h" diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp index 49b55ef04f..9ff56545c5 100644 --- a/src/terraform_cmd.cpp +++ b/src/terraform_cmd.cpp @@ -14,7 +14,6 @@ #include "command_func.h" #include "tunnel_map.h" #include "bridge_map.h" -#include "variables.h" #include "functions.h" #include "economy_func.h" #include "genworld.h" diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index cc4e58e73d..2c6a9a42a0 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -19,7 +19,6 @@ #include "viewport_func.h" #include "command_func.h" #include "signs_func.h" -#include "variables.h" #include "functions.h" #include "sound_func.h" #include "base_station_base.h" diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index c13c1ca229..c5b917858b 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -15,7 +15,6 @@ #include "window_func.h" #include "viewport_func.h" #include "command_func.h" -#include "variables.h" #include "vehicle_gui.h" #include "rail_gui.h" #include "road_gui.h" diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index c318ae1ce2..d994e8da5c 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -22,7 +22,6 @@ #include "news_func.h" #include "gui.h" #include "unmovable_map.h" -#include "variables.h" #include "genworld.h" #include "newgrf_debug.h" #include "newgrf_house.h" diff --git a/src/town_gui.cpp b/src/town_gui.cpp index b845ec7bc9..830d81ceda 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -20,7 +20,6 @@ #include "company_base.h" #include "company_gui.h" #include "network/network.h" -#include "variables.h" #include "strings_func.h" #include "sound_func.h" #include "economy_func.h" diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index baed9ab56a..085eea2236 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -17,7 +17,6 @@ #include "command_func.h" #include "economy_func.h" #include "town.h" -#include "variables.h" #include "genworld.h" #include "transparency.h" #include "functions.h" diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 893238e1b7..3cad201a9d 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -20,7 +20,6 @@ #include "cmd_helper.h" #include "command_func.h" #include "town.h" -#include "variables.h" #include "train.h" #include "ship.h" #include "roadveh.h" diff --git a/src/variables.h b/src/variables.h deleted file mode 100644 index 1fe9e2978e..0000000000 --- a/src/variables.h +++ /dev/null @@ -1,19 +0,0 @@ -/* $Id$ */ - -/* - * This file is part of OpenTTD. - * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. - * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . - */ - -/** @file variables.h Messing file that will cease to exist some time in the future. */ - -#ifndef VARIABLES_H -#define VARIABLES_H - -#ifndef VARDEF -#define VARDEF extern -#endif - -#endif /* VARIABLES_H */ diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp index 4181fee3cd..26fe059aed 100644 --- a/src/video/allegro_v.cpp +++ b/src/video/allegro_v.cpp @@ -19,7 +19,6 @@ #include "../stdafx.h" #include "../openttd.h" #include "../gfx_func.h" -#include "../variables.h" #include "../rev.h" #include "../blitter/factory.hpp" #include "../network/network.h" diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index 7589420b02..61dfd7ce20 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -26,7 +26,6 @@ #include "../../openttd.h" #include "../../debug.h" -#include "../../variables.h" #include "../../core/geometry_type.hpp" #include "cocoa_v.h" #include "../../blitter/factory.hpp" diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index 5df3f5b75f..08bf875fa1 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -26,7 +26,6 @@ #include "../../openttd.h" #include "../../debug.h" #include "../../os/macosx/splash.h" -#include "../../variables.h" #include "../../settings_type.h" #include "../../core/geometry_type.hpp" #include "cocoa_v.h" diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp index 48e65c747c..85ccf0a1c1 100644 --- a/src/video/dedicated_v.cpp +++ b/src/video/dedicated_v.cpp @@ -17,7 +17,6 @@ #include "../network/network.h" #include "../network/network_internal.h" #include "../console_func.h" -#include "../variables.h" #include "../genworld.h" #include "../fileio_type.h" #include "../fios.h" diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index d87e9e54e1..9e0a38fa99 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -15,7 +15,6 @@ #include "../openttd.h" #include "../gfx_func.h" #include "../sdl.h" -#include "../variables.h" #include "../rev.h" #include "../blitter/factory.hpp" #include "../network/network.h" diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 9f0a3c3df1..673d50be1a 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -12,7 +12,6 @@ #include "../stdafx.h" #include "../openttd.h" #include "../gfx_func.h" -#include "../variables.h" #include "../os/windows/win32.h" #include "../rev.h" #include "../blitter/factory.hpp" diff --git a/src/viewport.cpp b/src/viewport.cpp index b55c4a414b..1d7b94c3d2 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -33,7 +33,6 @@ #include "town.h" #include "signs_base.h" #include "signs_func.h" -#include "variables.h" #include "vehicle_base.h" #include "vehicle_gui.h" #include "blitter/factory.hpp" diff --git a/src/window.cpp b/src/window.cpp index 7215061b73..da6a1cc18c 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -17,7 +17,6 @@ #include "console_func.h" #include "console_gui.h" #include "viewport_func.h" -#include "variables.h" #include "genworld.h" #include "blitter/factory.hpp" #include "zoom_func.h"