diff options
| author | darkvater <darkvater@openttd.org> | 2005-02-07 19:45:08 +0000 |
|---|---|---|
| committer | darkvater <darkvater@openttd.org> | 2005-02-07 19:45:08 +0000 |
| commit | 8867c00d6806d38a3616931bb9a1be81797fc767 (patch) | |
| tree | e038a73a2b4ae43132597a7dcbb6f68197d008f6 | |
| parent | c1a2be0d054d0fff7ba49366f385a4ae0a78b229 (diff) | |
| download | openttd-8867c00d6806d38a3616931bb9a1be81797fc767.tar.xz | |
(svn r1845) - Revert r1835 since it totally screws network compiling
- Fix: fix some VS.NET warnings
- Add missing file to VS.NET project file
| -rw-r--r-- | misc_gui.c | 7 | ||||
| -rw-r--r-- | network.h | 1 | ||||
| -rw-r--r-- | network_data.h | 1 | ||||
| -rw-r--r-- | station_gui.c | 2 | ||||
| -rw-r--r-- | ttd.vcproj | 5 |
5 files changed, 12 insertions, 4 deletions
diff --git a/misc_gui.c b/misc_gui.c index 5fa581367..241e9ae1a 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -15,6 +15,11 @@ #include "sound.h" #include "network.h" +// Windows stuff for Clipboard +#if defined(WIN32) +#include <windows.h> +#endif + #include "hal.h" // for file list bool _query_string_active; @@ -700,7 +705,7 @@ static void DrawStationCoverageText(const uint *accepts, int str_x, int str_y, u if (b == &_userstring[3]) { b[0] = 0x81; - b[1] = STR_00D0_NOTHING; + b[1] = (char)STR_00D0_NOTHING; b[2] = STR_00D0_NOTHING >> 8; b[3] = 0; } else { @@ -1,6 +1,7 @@ #ifndef NETWORK_H #define NETWORK_H +#include "network_core.h" #define NOREV_STRING "norev000" #ifdef ENABLE_NETWORK diff --git a/network_data.h b/network_data.h index 18a0a2a1b..1210ca8f5 100644 --- a/network_data.h +++ b/network_data.h @@ -3,7 +3,6 @@ #include "ttd.h" #include "network.h" -#include "network_core.h" // Is the network enabled? #ifdef ENABLE_NETWORK diff --git a/station_gui.c b/station_gui.c index 14d93c21d..90a547c72 100644 --- a/station_gui.c +++ b/station_gui.c @@ -420,7 +420,7 @@ static void DrawStationViewWindow(Window *w) if (b == &_userstring[3]) { b[0] = 0x81; - b[1] = STR_00D0_NOTHING; + b[1] = (char)STR_00D0_NOTHING; b[2] = STR_00D0_NOTHING >> 8; b[3] = 0; } else { diff --git a/ttd.vcproj b/ttd.vcproj index 648c7aab8..931d9cdf7 100644 --- a/ttd.vcproj +++ b/ttd.vcproj @@ -314,7 +314,7 @@ </File>
<File
RelativePath=".\dedicated.c">
- </File>
+ </File>
<File
RelativePath=".\depot.c">
</File>
@@ -862,6 +862,9 @@ </FileConfiguration>
</File>
<File
+ RelativePath=".\string.c">
+ </File>
+ <File
RelativePath="strings.c">
<FileConfiguration
Name="Release|Win32">
|