diff --git a/Makefile b/Makefile index 94eb0726a0..f154b06902 100644 --- a/Makefile +++ b/Makefile @@ -679,7 +679,7 @@ C_SOURCES += town_gui.c C_SOURCES += train_cmd.c C_SOURCES += train_gui.c C_SOURCES += tree_cmd.c -C_SOURCES += ttd.c +C_SOURCES += openttd.c C_SOURCES += tunnelbridge_cmd.c C_SOURCES += unmovable_cmd.c C_SOURCES += vehicle.c @@ -830,7 +830,7 @@ lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt @echo '===> Compiling language $(*F)' $(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) -winres.o: ttd.rc +winres.o: openttd.rc @echo '===> Compiling resource $<' $(Q)$(WINDRES) -o $@ $< diff --git a/ai.c b/ai.c index 33d0aa4161..6885bac334 100644 --- a/ai.c +++ b/ai.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "map.h" #include "tile.h" #include "player.h" diff --git a/ai_build.c b/ai_build.c index 1328bd535a..32d31331f1 100644 --- a/ai_build.c +++ b/ai_build.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "map.h" #include "tile.h" diff --git a/ai_new.c b/ai_new.c index a2317fc068..93b7c20ef8 100644 --- a/ai_new.c +++ b/ai_new.c @@ -16,7 +16,7 @@ */ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/strings.h" #include "map.h" diff --git a/ai_pathfinder.c b/ai_pathfinder.c index 4fc273f581..734a82c4b8 100644 --- a/ai_pathfinder.c +++ b/ai_pathfinder.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "map.h" #include "tile.h" diff --git a/ai_shared.c b/ai_shared.c index 9a82f744a6..bd85b38104 100644 --- a/ai_shared.c +++ b/ai_shared.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "map.h" #include "ai.h" diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 3336792954..68a404b274 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/strings.h" #include "map.h" diff --git a/aircraft_gui.c b/aircraft_gui.c index 8f9c89e222..f15485762f 100644 --- a/aircraft_gui.c +++ b/aircraft_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/strings.h" #include "map.h" diff --git a/airport.c b/airport.c index 1acf083514..36be248f4d 100644 --- a/airport.c +++ b/airport.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "map.h" #include "airport.h" diff --git a/airport_gui.c b/airport_gui.c index cbb904fba8..b2c696a4b8 100644 --- a/airport_gui.c +++ b/airport_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "map.h" diff --git a/aystar.c b/aystar.c index 82ccb5800b..e2f9109fed 100644 --- a/aystar.c +++ b/aystar.c @@ -15,7 +15,7 @@ */ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "aystar.h" // This looks in the Hash if a node exists in ClosedList // If so, it returns the PathNode, else NULL diff --git a/bridge_gui.c b/bridge_gui.c index 5d9fa45acd..b8f940df8a 100644 --- a/bridge_gui.c +++ b/bridge_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "window.h" diff --git a/callback_table.c b/callback_table.c index 4dde04b50b..0299bb74e1 100644 --- a/callback_table.c +++ b/callback_table.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "functions.h" // If you add a callback for DoCommandP, also add the callback in here diff --git a/clear_cmd.c b/clear_cmd.c index 0ee8ee70a7..124723fec6 100644 --- a/clear_cmd.c +++ b/clear_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/command.c b/command.c index 7c198ec363..e0c9488413 100644 --- a/command.c +++ b/command.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "gui.h" diff --git a/console.c b/console.c index 763996328c..6239e4b602 100644 --- a/console.c +++ b/console.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/console_cmds.c b/console_cmds.c index a79f34b176..26bcea04ed 100644 --- a/console_cmds.c +++ b/console_cmds.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "console.h" #include "debug.h" #include "engine.h" diff --git a/debug.c b/debug.c index 2ac39fde46..3230c96d7d 100644 --- a/debug.c +++ b/debug.c @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include -#include "ttd.h" +#include "openttd.h" #include "console.h" #include "debug.h" #include "string.h" diff --git a/dedicated.c b/dedicated.c index 11c83fc0cb..a4a9198ab8 100644 --- a/dedicated.c +++ b/dedicated.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "network.h" #include "hal.h" diff --git a/depot.c b/depot.c index 289ef7a274..432405c2af 100644 --- a/depot.c +++ b/depot.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "depot.h" #include "tile.h" #include "map.h" diff --git a/disaster_cmd.c b/disaster_cmd.c index c6ec0ea499..a66c4c0a4a 100644 --- a/disaster_cmd.c +++ b/disaster_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/dock_gui.c b/dock_gui.c index 33de7e5160..c705b1a827 100644 --- a/dock_gui.c +++ b/dock_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "map.h" diff --git a/dummy_land.c b/dummy_land.c index 8efd8803dd..107647d9a6 100644 --- a/dummy_land.c +++ b/dummy_land.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "viewport.h" #include "command.h" diff --git a/economy.c b/economy.c index 03df70124d..889d7c6bcf 100644 --- a/economy.c +++ b/economy.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "strings.h" // XXX InjectDParam() #include "table/strings.h" #include "map.h" diff --git a/engine.c b/engine.c index 543e1129fd..e1a1399838 100644 --- a/engine.c +++ b/engine.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/strings.h" #include "engine.h" diff --git a/engine_gui.c b/engine_gui.c index 9f4abb4749..2961c8b986 100644 --- a/engine_gui.c +++ b/engine_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/fileio.c b/fileio.c index 4b6fee1ce0..4a9cd0284a 100644 --- a/fileio.c +++ b/fileio.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "fileio.h" #if defined(UNIX) || defined(__OS2__) #include // required for tolower() diff --git a/gfx.c b/gfx.c index 6c81b42162..346f4c71de 100644 --- a/gfx.c +++ b/gfx.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "spritecache.h" #include "strings.h" #include "gfx.h" diff --git a/graph_gui.c b/graph_gui.c index d27c140b95..8c48331362 100644 --- a/graph_gui.c +++ b/graph_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/industry_cmd.c b/industry_cmd.c index 441d6447e4..c21c80d914 100644 --- a/industry_cmd.c +++ b/industry_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/industry_gui.c b/industry_gui.c index 57ac668952..4776ea97fb 100644 --- a/industry_gui.c +++ b/industry_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "strings.h" #include "table/strings.h" diff --git a/intro_gui.c b/intro_gui.c index 1725d400d3..273d9588e5 100644 --- a/intro_gui.c +++ b/intro_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/landscape.c b/landscape.c index 755e3a48fa..881ca67a14 100644 --- a/landscape.c +++ b/landscape.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "map.h" #include "spritecache.h" #include "table/sprites.h" diff --git a/main_gui.c b/main_gui.c index de5c8cfe4c..08c790e399 100644 --- a/main_gui.c +++ b/main_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "spritecache.h" #include "strings.h" #include "table/sprites.h" diff --git a/map.c b/map.c index ae8d2e916c..a397d4b8fc 100644 --- a/map.c +++ b/map.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "functions.h" #include "map.h" diff --git a/misc.c b/misc.c index 1d8a709b03..4c88c88053 100644 --- a/misc.c +++ b/misc.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "string.h" #include "strings.h" // XXX GetParam* #include "table/strings.h" diff --git a/misc_cmd.c b/misc_cmd.c index a8b357ec71..430bef6bd4 100644 --- a/misc_cmd.c +++ b/misc_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "string.h" #include "table/strings.h" #include "command.h" diff --git a/misc_gui.c b/misc_gui.c index 63fb1b6ef2..b737ee3c47 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "spritecache.h" #include "strings.h" diff --git a/mixer.c b/mixer.c index 706eaae5db..2393eb9c09 100644 --- a/mixer.c +++ b/mixer.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "mixer.h" struct MixerChannel { diff --git a/music_gui.c b/music_gui.c index 459689736d..c16efaa992 100644 --- a/music_gui.c +++ b/music_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/namegen.c b/namegen.c index 887af46402..59d217b2a9 100644 --- a/namegen.c +++ b/namegen.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "namegen.h" #include "table/namegen.h" diff --git a/network_data.h b/network_data.h index 48e1cf19e0..38a817d1a7 100644 --- a/network_data.h +++ b/network_data.h @@ -1,7 +1,7 @@ #ifndef NETWORK_DATA_H #define NETWORK_DATA_H -#include "ttd.h" +#include "openttd.h" #include "network.h" #include "network_core.h" diff --git a/network_gui.c b/network_gui.c index 4f80257137..44ff45f910 100644 --- a/network_gui.c +++ b/network_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "string.h" #include "strings.h" #include "table/sprites.h" diff --git a/newgrf.c b/newgrf.c index 0815d80344..df9fbed7c1 100644 --- a/newgrf.c +++ b/newgrf.c @@ -2,7 +2,7 @@ #include -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "gfx.h" #include "fileio.h" diff --git a/news_gui.c b/news_gui.c index 30e3831353..700f589e4d 100644 --- a/news_gui.c +++ b/news_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "strings.h" #include "table/sprites.h" #include "table/strings.h" diff --git a/npf.c b/npf.c index fd331ae96f..0c24c05926 100644 --- a/npf.c +++ b/npf.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "npf.h" #include "aystar.h" diff --git a/npf.h b/npf.h index dcbe645296..e239c8971c 100644 --- a/npf.h +++ b/npf.h @@ -3,7 +3,7 @@ /* Blaat */ -#include "ttd.h" +#include "openttd.h" #include "aystar.h" #include "vehicle.h" diff --git a/oldloader.c b/oldloader.c index 89a8da27c1..141e31e713 100644 --- a/oldloader.c +++ b/oldloader.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "town.h" diff --git a/ttd.c b/openttd.c similarity index 99% rename from ttd.c rename to openttd.c index ba8f241f06..619c964f82 100644 --- a/ttd.c +++ b/openttd.c @@ -7,7 +7,7 @@ #include "tile.h" #define VARDEF -#include "ttd.h" +#include "openttd.h" #include "mixer.h" #include "spritecache.h" #include "gfx.h" diff --git a/ttd.dsp b/openttd.dsp similarity index 94% rename from ttd.dsp rename to openttd.dsp index 12287d265a..8231e72577 100644 --- a/ttd.dsp +++ b/openttd.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="ttd" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="openttd" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=ttd - Win32 Debug +CFG=openttd - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "ttd.mak". +!MESSAGE NMAKE /f "openttd.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "ttd.mak" CFG="ttd - Win32 Checked" +!MESSAGE NMAKE /f "openttd.mak" CFG="openttd - Win32 Checked" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ttd - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "ttd - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "openttd - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "openttd - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=ttd - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "ttd - Win32 Release" +!IF "$(CFG)" == "openttd - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -54,7 +54,7 @@ LINK32=link.exe # ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib /nologo /subsystem:windows /map /machine:I386 /opt:nowin98 # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "ttd - Win32 Debug" +!ELSEIF "$(CFG)" == "openttd - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -84,8 +84,8 @@ LINK32=link.exe # Begin Target -# Name "ttd - Win32 Release" -# Name "ttd - Win32 Debug" +# Name "openttd - Win32 Release" +# Name "openttd - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -173,11 +173,11 @@ SOURCE=.\md5.c # Begin Source File SOURCE=.\minilzo.c -!IF "$(CFG)" == "ttd - Win32 Release" +!IF "$(CFG)" == "openttd - Win32 Release" # SUBTRACT CPP /YX /Yc /Yu -!ELSEIF "$(CFG)" == "ttd - Win32 Debug" +!ELSEIF "$(CFG)" == "openttd - Win32 Debug" # SUBTRACT CPP /YX @@ -265,11 +265,11 @@ SOURCE=.\spritecache.c SOURCE=.\StdAfx.c -!IF "$(CFG)" == "ttd - Win32 Release" +!IF "$(CFG)" == "openttd - Win32 Release" # ADD CPP /Yc"stdafx.h" -!ELSEIF "$(CFG)" == "ttd - Win32 Debug" +!ELSEIF "$(CFG)" == "openttd - Win32 Debug" !ENDIF @@ -292,22 +292,22 @@ SOURCE=.\tile.c # End Source File # Begin Source File -SOURCE=.\ttd.c +SOURCE=.\openttd.c # End Source File # Begin Source File -SOURCE=.\ttd.rc +SOURCE=.\openttd.rc # End Source File # Begin Source File SOURCE=.\unix.c -!IF "$(CFG)" == "ttd - Win32 Release" +!IF "$(CFG)" == "openttd - Win32 Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "ttd - Win32 Debug" +!ELSEIF "$(CFG)" == "openttd - Win32 Debug" # PROP Exclude_From_Build 1 @@ -339,11 +339,11 @@ SOURCE=.\waypoint.c SOURCE=.\w32dm2.cpp -!IF "$(CFG)" == "ttd - Win32 Release" +!IF "$(CFG)" == "openttd - Win32 Release" # SUBTRACT CPP /YX /Yc /Yu -!ELSEIF "$(CFG)" == "ttd - Win32 Debug" +!ELSEIF "$(CFG)" == "openttd - Win32 Debug" !ENDIF @@ -499,7 +499,7 @@ SOURCE=.\town.h # End Source File # Begin Source File -SOURCE=.\ttd.h +SOURCE=.\openttd.h # End Source File # Begin Source File diff --git a/ttd.dsw b/openttd.dsw similarity index 94% rename from ttd.dsw rename to openttd.dsw index 86e4d34bea..6ef816d4c2 100644 --- a/ttd.dsw +++ b/openttd.dsw @@ -30,7 +30,7 @@ Package=<4> ############################################################################### -Project: "ttd"=.\ttd.dsp - Package Owner=<4> +Project: "openttd"=.\openttd.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/ttd.h b/openttd.h similarity index 100% rename from ttd.h rename to openttd.h diff --git a/ttd.rc b/openttd.rc similarity index 100% rename from ttd.rc rename to openttd.rc diff --git a/ttd.sln b/openttd.sln similarity index 94% rename from ttd.sln rename to openttd.sln index 15bcf5e154..c8072d9e9b 100644 --- a/ttd.sln +++ b/openttd.sln @@ -3,7 +3,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen\strgen.vcp ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttd", "ttd.vcproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd.vcproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}" ProjectSection(ProjectDependencies) = postProject {0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966} {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} diff --git a/ttd.vcproj b/openttd.vcproj similarity index 97% rename from ttd.vcproj rename to openttd.vcproj index de43463d3e..4bfe6ac4e6 100644 --- a/ttd.vcproj +++ b/openttd.vcproj @@ -2,7 +2,7 @@ @@ -38,7 +38,7 @@ DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="1" PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\Release/ttd.pch" + PrecompiledHeaderFile=".\Release/openttd.pch" AssemblerOutput="2" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" @@ -57,16 +57,16 @@ OutputFile=".\Release/openttd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\Release/ttd.pdb" + ProgramDatabaseFile=".\Release/openttd.pdb" GenerateMapFile="TRUE" - MapFileName=".\Release/ttd.map" + MapFileName=".\Release/openttd.map" SubSystem="2" OptimizeReferences="2" OptimizeForWindows98="1" TargetMachine="1"/> @@ -105,7 +105,7 @@ RuntimeLibrary="5" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\Debug/ttd.pch" + PrecompiledHeaderFile=".\Debug/openttd.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" @@ -125,12 +125,12 @@ LinkIncremental="0" SuppressStartupBanner="TRUE" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/ttd.pdb" + ProgramDatabaseFile=".\Debug/openttd.pdb" SubSystem="2" TargetMachine="1"/> @@ -308,10 +308,10 @@ RelativePath=".\tile.c"> + RelativePath="openttd.c"> + RelativePath="openttd.rc"> @@ -475,7 +475,7 @@ RelativePath=".\town.h"> + RelativePath="openttd.h"> diff --git a/order_cmd.c b/order_cmd.c index f068d15abf..2476444591 100644 --- a/order_cmd.c +++ b/order_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "airport.h" #include "depot.h" #include "table/strings.h" diff --git a/order_gui.c b/order_gui.c index 966a84839b..1361537947 100644 --- a/order_gui.c +++ b/order_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "map.h" diff --git a/pathfind.c b/pathfind.c index 58eaba04aa..c8b75ed154 100644 --- a/pathfind.c +++ b/pathfind.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "map.h" #include "tile.h" #include "pathfind.h" diff --git a/player_gui.c b/player_gui.c index 8b5e2f2e47..ceb21a605f 100644 --- a/player_gui.c +++ b/player_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "window.h" diff --git a/players.c b/players.c index 17a4b54eec..58cc52bcb7 100644 --- a/players.c +++ b/players.c @@ -2,7 +2,7 @@ * sjdlfkasjdf */ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "string.h" #include "strings.h" #include "table/strings.h" diff --git a/pool.c b/pool.c index 5f41716688..cb12311b78 100644 --- a/pool.c +++ b/pool.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "pool.h" diff --git a/queue.c b/queue.c index 034af816b3..56260cf27d 100644 --- a/queue.c +++ b/queue.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "queue.h" static void Stack_Clear(Queue* q, bool free_values) diff --git a/rail_cmd.c b/rail_cmd.c index 42516594b0..d155e40ae1 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "gfx.h" diff --git a/rail_gui.c b/rail_gui.c index 9734c138f3..0d88dc50e0 100644 --- a/rail_gui.c +++ b/rail_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "map.h" diff --git a/road_cmd.c b/road_cmd.c index 8122fc9c84..ce8659cb20 100644 --- a/road_cmd.c +++ b/road_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/road_gui.c b/road_gui.c index b7efcebd39..d2ab49ba2d 100644 --- a/road_gui.c +++ b/road_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "map.h" diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 60c59f1529..7d469579b6 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/strings.h" #include "map.h" diff --git a/roadveh_gui.c b/roadveh_gui.c index 96faab074a..0924941541 100644 --- a/roadveh_gui.c +++ b/roadveh_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/strings.h" #include "map.h" diff --git a/saveload.c b/saveload.c index 55166f40bd..8172f39efc 100644 --- a/saveload.c +++ b/saveload.c @@ -14,7 +14,7 @@ * @see SaveLoad */ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "vehicle.h" #include "station.h" diff --git a/screenshot.c b/screenshot.c index b7129a4a9c..098070f38d 100644 --- a/screenshot.c +++ b/screenshot.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "strings.h" #include "table/strings.h" diff --git a/sdl.c b/sdl.c index bb73f44829..e0f955f7a4 100644 --- a/sdl.c +++ b/sdl.c @@ -1,7 +1,7 @@ #include "stdafx.h" #if defined(WITH_SDL) -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "gfx.h" #include "mixer.h" diff --git a/settings.c b/settings.c index 68411f2abd..0358d0fca0 100644 --- a/settings.c +++ b/settings.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "sound.h" #include "string.h" #include "table/currency.h" diff --git a/settings_gui.c b/settings_gui.c index cfdf18c3bc..a0d716e6a8 100644 --- a/settings_gui.c +++ b/settings_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "string.h" #include "strings.h" // XXX GetCurrentCurrencyRate() #include "table/sprites.h" diff --git a/ship_cmd.c b/ship_cmd.c index b8190d6b7f..1db631b1ef 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/ship_gui.c b/ship_gui.c index 70e39c49ef..640361fc21 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/strings.h" #include "map.h" diff --git a/signs.c b/signs.c index d39382ec2c..707d557887 100644 --- a/signs.c +++ b/signs.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "signs.h" #include "saveload.h" diff --git a/smallmap_gui.c b/smallmap_gui.c index 51c2f7f75d..46926c2cee 100644 --- a/smallmap_gui.c +++ b/smallmap_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "spritecache.h" #include "table/strings.h" #include "map.h" diff --git a/sound.c b/sound.c index 4d87d8fe60..071fdd17e8 100644 --- a/sound.c +++ b/sound.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "map.h" #include "mixer.h" #include "sound.h" diff --git a/sprite.c b/sprite.c index 8341b01c0d..617d0705e6 100644 --- a/sprite.c +++ b/sprite.c @@ -2,7 +2,7 @@ #include -#include "ttd.h" +#include "openttd.h" #include "sprite.h" diff --git a/spritecache.c b/spritecache.c index b9310e02e1..2937ba2b86 100644 --- a/spritecache.c +++ b/spritecache.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "gfx.h" #include "spritecache.h" diff --git a/station_cmd.c b/station_cmd.c index bd276ed94c..c01cb64e9c 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/sprites.h" #include "table/strings.h" diff --git a/station_gui.c b/station_gui.c index 046b580ecd..294e14f342 100644 --- a/station_gui.c +++ b/station_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "strings.h" #include "table/strings.h" diff --git a/strings.c b/strings.c index c906b89529..11632a97fa 100644 --- a/strings.c +++ b/strings.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "string.h" #include "strings.h" #include "table/strings.h" diff --git a/subsidy_gui.c b/subsidy_gui.c index 03b8069901..d7237a1889 100644 --- a/subsidy_gui.c +++ b/subsidy_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/table/namegen.h b/table/namegen.h index e5977b9ef2..923ec2dfae 100644 --- a/table/namegen.h +++ b/table/namegen.h @@ -1,5 +1,5 @@ #include "../stdafx.h" -#include "../ttd.h" +#include "../openttd.h" static const char *name_original_english_1[] = { "Great ", diff --git a/terraform_gui.c b/terraform_gui.c index 10845c4d26..738c3eb554 100644 --- a/terraform_gui.c +++ b/terraform_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "tile.h" diff --git a/texteff.c b/texteff.c index b418b55de1..db3ee04c12 100644 --- a/texteff.c +++ b/texteff.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "strings.h" #include "gfx.h" #include "viewport.h" diff --git a/town_cmd.c b/town_cmd.c index b9d9609261..711774752c 100644 --- a/town_cmd.c +++ b/town_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "strings.h" #include "table/strings.h" #include "map.h" diff --git a/town_gui.c b/town_gui.c index 17c98fd201..0767e078f7 100644 --- a/town_gui.c +++ b/town_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "strings.h" #include "table/sprites.h" diff --git a/train_cmd.c b/train_cmd.c index 483eb73708..185464b6f2 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/train_gui.c b/train_gui.c index 1e8ce749c5..8cec32d19f 100644 --- a/train_gui.c +++ b/train_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "table/strings.h" #include "map.h" diff --git a/tree_cmd.c b/tree_cmd.c index 921878ece9..18b71c1d0d 100644 --- a/tree_cmd.c +++ b/tree_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "table/tree_land.h" #include "map.h" diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index b489f43a74..e18c5ad183 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "map.h" diff --git a/unmovable_cmd.c b/unmovable_cmd.c index 5a0c5345bb..00be0473f0 100644 --- a/unmovable_cmd.c +++ b/unmovable_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/vehicle.c b/vehicle.c index fba10a87ba..d73739ad98 100644 --- a/vehicle.c +++ b/vehicle.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "spritecache.h" #include "table/sprites.h" #include "table/strings.h" diff --git a/vehicle_gui.c b/vehicle_gui.c index ce67dc171c..16edc3b99c 100644 --- a/vehicle_gui.c +++ b/vehicle_gui.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "strings.h" #include "table/sprites.h" diff --git a/viewport.c b/viewport.c index ffcd3d8b68..f1e7b5cca8 100644 --- a/viewport.c +++ b/viewport.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "spritecache.h" #include "strings.h" diff --git a/w32dm.c b/w32dm.c index 9bd1ce3f5b..2c60768a27 100644 --- a/w32dm.c +++ b/w32dm.c @@ -28,7 +28,7 @@ #ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT -#include "ttd.h" +#include "openttd.h" #include "string.h" #include "sound.h" #include "hal.h" diff --git a/w32dm2.cpp b/w32dm2.cpp index 01a0704168..09ecf385d1 100644 --- a/w32dm2.cpp +++ b/w32dm2.cpp @@ -37,7 +37,7 @@ extern "C" { #endif -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "sound.h" #include "hal.h" diff --git a/water_cmd.c b/water_cmd.c index 9c14736e2f..b7555ec9c9 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "map.h" diff --git a/waypoint.c b/waypoint.c index 93e56b935f..f66e9e9939 100644 --- a/waypoint.c +++ b/waypoint.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "command.h" #include "gfx.h" diff --git a/widget.c b/widget.c index 001c706686..6cf5b03f65 100644 --- a/widget.c +++ b/widget.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "table/sprites.h" #include "table/strings.h" #include "window.h" diff --git a/win32.c b/win32.c index 3c02511f8f..2b9e7c0053 100644 --- a/win32.c +++ b/win32.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "string.h" #include "table/strings.h" diff --git a/window.c b/window.c index eaaeafab1d..22dcb116f8 100644 --- a/window.c +++ b/window.c @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "ttd.h" +#include "openttd.h" #include "debug.h" #include "map.h" #include "window.h"