(svn r1845) - Revert r1835 since it totally screws network compiling

- Fix: fix some VS.NET warnings
- Add missing file to VS.NET project file
This commit is contained in:
darkvater 2005-02-07 19:45:08 +00:00
parent c1a2be0d05
commit 8867c00d68
5 changed files with 12 additions and 4 deletions

View File

@ -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 {

View File

@ -1,6 +1,7 @@
#ifndef NETWORK_H
#define NETWORK_H
#include "network_core.h"
#define NOREV_STRING "norev000"
#ifdef ENABLE_NETWORK

View File

@ -3,7 +3,6 @@
#include "ttd.h"
#include "network.h"
#include "network_core.h"
// Is the network enabled?
#ifdef ENABLE_NETWORK

View File

@ -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 {

View File

@ -314,7 +314,7 @@
</File>
<File
RelativePath=".\dedicated.c">
</File>
</File>
<File
RelativePath=".\depot.c">
</File>
@ -861,6 +861,9 @@
BasicRuntimeChecks="3"/>
</FileConfiguration>
</File>
<File
RelativePath=".\string.c">
</File>
<File
RelativePath="strings.c">
<FileConfiguration