summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--openttd.dsp423
-rw-r--r--saveload.c1
2 files changed, 202 insertions, 222 deletions
diff --git a/openttd.dsp b/openttd.dsp
index 7de5b42f9..b0b0acf71 100644
--- a/openttd.dsp
+++ b/openttd.dsp
@@ -13,7 +13,7 @@ CFG=openttd - Win32 Debug
!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 "openttd.mak" CFG="openttd - Win32 Checked"
+!MESSAGE NMAKE /f "openttd.mak" CFG="openttd - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /Gd /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c
+# ADD CPP /nologo /Gr /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c
# SUBTRACT CPP /WX /Ot
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
@@ -86,95 +86,95 @@ LINK32=link.exe
# 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"
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\ai_old.c
-# End Source File
-# Begin Source File
SOURCE=.\ai_build.c
# End Source File
-
# Begin Source File
+
SOURCE=.\ai_new.c
# End Source File
+# Begin Source File
+SOURCE=.\ai_old.c
+# End Source File
# Begin Source File
+
SOURCE=.\ai_pathfinder.c
# End Source File
-
# Begin Source File
+
SOURCE=.\ai_shared.c
# End Source File
-
# Begin Source File
+
SOURCE=.\airport.c
# End Source File
-
# Begin Source File
+
SOURCE=.\aystar.c
# End Source File
-
# Begin Source File
+
SOURCE=.\command.c
# End Source File
-
# Begin Source File
+
SOURCE=.\console.c
# End Source File
-
# Begin Source File
+
SOURCE=.\console_cmds.c
# End Source File
-
# Begin Source File
+
SOURCE=.\debug.c
# End Source File
-
# Begin Source File
+
SOURCE=.\depot.c
# End Source File
-
# Begin Source File
+
SOURCE=.\documentation.txt
# End Source File
-
# Begin Source File
+
SOURCE=.\economy.c
# End Source File
-
# Begin Source File
+
SOURCE=.\engine.c
# End Source File
-
# Begin Source File
+
SOURCE=.\fileio.c
# End Source File
-
# Begin Source File
+
SOURCE=.\gfx.c
# End Source File
-
# Begin Source File
+
SOURCE=.\landscape.c
# End Source File
-
# Begin Source File
+
SOURCE=.\map.c
# End Source File
-
# Begin Source File
+
SOURCE=.\md5.c
# End Source File
-
# Begin Source File
+
SOURCE=.\mersenne.c
# End Source File
-
# Begin Source File
+
SOURCE=.\minilzo.c
!IF "$(CFG)" == "openttd - Win32 Release"
@@ -188,91 +188,98 @@ SOURCE=.\minilzo.c
!ENDIF
# End Source File
-
# Begin Source File
+
SOURCE=.\misc.c
# End Source File
-
# Begin Source File
+
SOURCE=.\mixer.c
# End Source File
-
# Begin Source File
+
SOURCE=.\namegen.c
# End Source File
-
# Begin Source File
+
SOURCE=.\network.c
# End Source File
-
# Begin Source File
+
SOURCE=.\newgrf.c
# End Source File
-
# Begin Source File
+
SOURCE=.\npf.c
# End Source File
-
# Begin Source File
+
SOURCE=.\oldloader.c
# End Source File
+# Begin Source File
+SOURCE=.\openttd.c
+# End Source File
# Begin Source File
-SOURCE=.\pathfind.c
+
+SOURCE=.\openttd.rc
# End Source File
+# Begin Source File
+SOURCE=.\pathfind.c
+# End Source File
# Begin Source File
+
SOURCE=.\pbs.c
# End Source File
-
# Begin Source File
-SOURCE=.\pool.c
-# End Source File
-# Begin Source File
SOURCE=.\players.c
# End Source File
+# Begin Source File
+SOURCE=.\pool.c
+# End Source File
# Begin Source File
+
SOURCE=.\queue.c
# End Source File
-
# Begin Source File
+
SOURCE=.\rail.c
# End Source File
-
# Begin Source File
+
SOURCE=.\saveload.c
# End Source File
-
# Begin Source File
+
SOURCE=.\screenshot.c
# End Source File
-
# Begin Source File
+
SOURCE=.\sdl.c
# End Source File
-
# Begin Source File
+
SOURCE=.\settings.c
# End Source File
-
# Begin Source File
+
SOURCE=.\signs.c
# End Source File
-
# Begin Source File
+
SOURCE=.\sound.c
# End Source File
-
# Begin Source File
+
SOURCE=.\sprite.c
# End Source File
-
# Begin Source File
+
SOURCE=.\spritecache.c
# End Source File
-
# Begin Source File
SOURCE=.\StdAfx.c
@@ -286,67 +293,43 @@ SOURCE=.\StdAfx.c
!ENDIF
# End Source File
-
# Begin Source File
+
SOURCE=.\string.c
# End Source File
-
# Begin Source File
+
SOURCE=.\strings.c
# End Source File
-
# Begin Source File
-SOURCE=.\texteff.c
-# End Source File
-# Begin Source File
-SOURCE=.\tile.c
+SOURCE=.\texteff.c
# End Source File
-
# Begin Source File
-SOURCE=.\openttd.c
-# End Source File
-# Begin Source File
-SOURCE=.\openttd.rc
+SOURCE=.\tile.c
# End Source File
-
# Begin Source File
SOURCE=.\unix.c
-
-!IF "$(CFG)" == "openttd - Win32 Release"
-
# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "openttd - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
# End Source File
-
# Begin Source File
+
SOURCE=.\vehicle.c
# End Source File
-
# Begin Source File
+
SOURCE=.\vehicle_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\viewport.c
# End Source File
-
# Begin Source File
-SOURCE=.\w32dm.c
-# End Source File
-# Begin Source File
-SOURCE=.\waypoint.c
+SOURCE=.\w32dm.c
# End Source File
-
# Begin Source File
SOURCE=.\w32dm2.cpp
@@ -360,566 +343,562 @@ SOURCE=.\w32dm2.cpp
!ENDIF
# End Source File
+# Begin Source File
+SOURCE=.\waypoint.c
+# End Source File
# Begin Source File
+
SOURCE=.\widget.c
# End Source File
-
# Begin Source File
+
SOURCE=.\win32.c
# End Source File
-
# Begin Source File
+
SOURCE=.\window.c
# End Source File
-
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
-
# Begin Source File
+
SOURCE=.\ai_new.h
# End Source File
-
# Begin Source File
+
SOURCE=.\aystar.h
# End Source File
-
# Begin Source File
+
SOURCE=.\command.h
# End Source File
-
# Begin Source File
+
SOURCE=.\console.h
# End Source File
-
# Begin Source File
+
SOURCE=.\debug.h
# End Source File
-
# Begin Source File
+
SOURCE=.\depot.h
# End Source File
-
# Begin Source File
+
SOURCE=.\economy.h
# End Source File
-
# Begin Source File
+
SOURCE=.\engine.h
# End Source File
-
# Begin Source File
+
SOURCE=.\fileio.h
# End Source File
-
# Begin Source File
+
SOURCE=.\functions.h
# End Source File
-
# Begin Source File
+
SOURCE=.\gfx.h
# End Source File
-
# Begin Source File
+
SOURCE=.\gui.h
# End Source File
-
# Begin Source File
+
SOURCE=.\hal.h
# End Source File
-
# Begin Source File
+
SOURCE=.\industry.h
# End Source File
-
# Begin Source File
+
SOURCE=.\macros.h
# End Source File
-
# Begin Source File
+
SOURCE=.\map.h
# End Source File
-
# Begin Source File
+
SOURCE=.\md5.h
# End Source File
-
# Begin Source File
+
SOURCE=.\network.h
# End Source File
-
# Begin Source File
+
SOURCE=.\news.h
# End Source File
-
# Begin Source File
+
SOURCE=.\npf.h
# End Source File
-
# Begin Source File
+
SOURCE=.\openttd.h
# End Source File
-
# Begin Source File
+
SOURCE=.\pathfind.h
# End Source File
-
# Begin Source File
+
SOURCE=.\pbs.h
# End Source File
-
# Begin Source File
-SOURCE=.\pool.h
-# End Source File
-# Begin Source File
SOURCE=.\player.h
# End Source File
+# Begin Source File
+SOURCE=.\pool.h
+# End Source File
# Begin Source File
+
SOURCE=.\queue.h
# End Source File
-
# Begin Source File
+
SOURCE=.\rail.h
# End Source File
-
# Begin Source File
+
SOURCE=.\saveload.h
# End Source File
-
# Begin Source File
+
SOURCE=.\signs.h
# End Source File
-
# Begin Source File
+
SOURCE=.\sound.h
# End Source File
-
# Begin Source File
+
SOURCE=.\station.h
# End Source File
+# Begin Source File
+SOURCE=.\StdAfx.h
+# End Source File
# Begin Source File
+
SOURCE=.\string.h
# End Source File
-
# Begin Source File
+
SOURCE=.\strings.h
# End Source File
-
# Begin Source File
-SOURCE=.\StdAfx.h
-# End Source File
-# Begin Source File
SOURCE=.\tile.h
# End Source File
-
# Begin Source File
+
SOURCE=.\town.h
# End Source File
-
# Begin Source File
+
SOURCE=.\variables.h
# End Source File
-
# Begin Source File
+
SOURCE=.\vehicle.h
# End Source File
-
# Begin Source File
+
SOURCE=.\vehicle_gui.h
# End Source File
-
# Begin Source File
+
SOURCE=.\viewport.h
# End Source File
-
# Begin Source File
+
SOURCE=.\waypoint.h
# End Source File
-
# Begin Source File
+
SOURCE=.\window.h
# End Source File
-
# End Group
# Begin Group "Gui Source codes"
# PROP Default_Filter ""
-
# Begin Source File
+
SOURCE=.\aircraft_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\airport_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\bridge_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\dock_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\engine_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\graph_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\industry_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\intro_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\main_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\misc_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\music_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\network_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\news_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\order_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\player_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\rail_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\road_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\roadveh_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\settings_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\ship_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\smallmap_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\station_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\subsidy_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\terraform_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\town_gui.c
# End Source File
-
# Begin Source File
+
SOURCE=.\train_gui.c
# End Source File
-
# End Group
# Begin Group "Landscape"
# PROP Default_Filter ""
-
# Begin Source File
+
SOURCE=.\aircraft_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\clear_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\disaster_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\dummy_land.c
# End Source File
-
# Begin Source File
+
SOURCE=.\industry_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\misc_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\order_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\rail_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\road_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\roadveh_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\ship_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\station_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\town_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\train_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\tree_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\tunnelbridge_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\unmovable_cmd.c
# End Source File
-
# Begin Source File
+
SOURCE=.\water_cmd.c
# End Source File
-
# End Group
# Begin Group "Tables"
# PROP Default_Filter ""
-
# Begin Source File
+
SOURCE=.\table\ai_rail.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\allstrings.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\animcursors.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\autorail.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\build_industry.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\clear_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\engines.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\files.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\genland.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\industry_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\landscape_const.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\landscape_sprite.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\namegen.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\palettes.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\road_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\roadveh.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\sprites.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\station_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\strings.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\town_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\track_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\train_cmd.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\tree_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\tunnel_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\unmovable_land.h
# End Source File
-
# Begin Source File
+
SOURCE=.\table\water_land.h
# End Source File
-
# End Group
# Begin Group "Network Source Files"
# PROP Default_Filter ""
-
# Begin Source File
+
SOURCE=.\callback_table.c
# End Source File
-
# Begin Source File
+
SOURCE=.\dedicated.c
# End Source File
-
# Begin Source File
+
SOURCE=.\network_client.c
# End Source File
-
# Begin Source File
+
SOURCE=.\network_data.c
# End Source File
-
# Begin Source File
+
SOURCE=.\network_gamelist.c
# End Source File
-
# Begin Source File
+
SOURCE=.\network_server.c
# End Source File
-
# Begin Source File
+
SOURCE=.\network_udp.c
# End Source File
-
# End Group
# Begin Group "Network Header Files"
# PROP Default_Filter ""
-
# Begin Source File
+
SOURCE=.\network_client.h
# End Source File
-
# Begin Source File
+
SOURCE=.\network_core.h
# End Source File
-
# Begin Source File
+
SOURCE=.\network_data.h
# End Source File
-
# Begin Source File
+
SOURCE=.\network_gamelist.h
# End Source File
-
# Begin Source File
+
SOURCE=.\network_server.h
# End Source File
-
# Begin Source File
+
SOURCE=.\network_udp.h
# End Source File
-
# End Group
-
# Begin Source File
+
SOURCE=.\changelog.txt
# End Source File
-
# Begin Source File
-SOURCE=.\openttd.ico
-# End Source File
-# Begin Source File
SOURCE=.\mainicon.ico
# End Source File
+# Begin Source File
+SOURCE=.\openttd.ico
+# End Source File
# Begin Source File
+
SOURCE=.\ReadMe.txt
# End Source File
-
# End Target
# End Project
diff --git a/saveload.c b/saveload.c
index 8739daca1..365f0b496 100644
--- a/saveload.c
+++ b/saveload.c
@@ -905,6 +905,7 @@ static void WriteMem(uint size)
//********************************************
#if defined(WITH_ZLIB)
+#define ZLIB_WINAPI // Needed so zlib uses the right calling convention.
#include <zlib.h>
static z_stream _z;
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-06 22:45:49 +0000