mirror of https://github.com/OpenTTD/OpenTTD
(svn r1845) - Revert r1835 since it totally screws network compiling
- Fix: fix some VS.NET warnings - Add missing file to VS.NET project filerelease/0.4.5
parent
c1a2be0d05
commit
8867c00d68
|
@ -15,6 +15,11 @@
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
|
|
||||||
|
// Windows stuff for Clipboard
|
||||||
|
#if defined(WIN32)
|
||||||
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "hal.h" // for file list
|
#include "hal.h" // for file list
|
||||||
|
|
||||||
bool _query_string_active;
|
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]) {
|
if (b == &_userstring[3]) {
|
||||||
b[0] = 0x81;
|
b[0] = 0x81;
|
||||||
b[1] = STR_00D0_NOTHING;
|
b[1] = (char)STR_00D0_NOTHING;
|
||||||
b[2] = STR_00D0_NOTHING >> 8;
|
b[2] = STR_00D0_NOTHING >> 8;
|
||||||
b[3] = 0;
|
b[3] = 0;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#ifndef NETWORK_H
|
#ifndef NETWORK_H
|
||||||
#define NETWORK_H
|
#define NETWORK_H
|
||||||
|
|
||||||
|
#include "network_core.h"
|
||||||
#define NOREV_STRING "norev000"
|
#define NOREV_STRING "norev000"
|
||||||
|
|
||||||
#ifdef ENABLE_NETWORK
|
#ifdef ENABLE_NETWORK
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include "ttd.h"
|
#include "ttd.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
#include "network_core.h"
|
|
||||||
|
|
||||||
// Is the network enabled?
|
// Is the network enabled?
|
||||||
#ifdef ENABLE_NETWORK
|
#ifdef ENABLE_NETWORK
|
||||||
|
|
|
@ -420,7 +420,7 @@ static void DrawStationViewWindow(Window *w)
|
||||||
|
|
||||||
if (b == &_userstring[3]) {
|
if (b == &_userstring[3]) {
|
||||||
b[0] = 0x81;
|
b[0] = 0x81;
|
||||||
b[1] = STR_00D0_NOTHING;
|
b[1] = (char)STR_00D0_NOTHING;
|
||||||
b[2] = STR_00D0_NOTHING >> 8;
|
b[2] = STR_00D0_NOTHING >> 8;
|
||||||
b[3] = 0;
|
b[3] = 0;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -314,7 +314,7 @@
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\dedicated.c">
|
RelativePath=".\dedicated.c">
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\depot.c">
|
RelativePath=".\depot.c">
|
||||||
</File>
|
</File>
|
||||||
|
@ -861,6 +861,9 @@
|
||||||
BasicRuntimeChecks="3"/>
|
BasicRuntimeChecks="3"/>
|
||||||
</FileConfiguration>
|
</FileConfiguration>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\string.c">
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="strings.c">
|
RelativePath="strings.c">
|
||||||
<FileConfiguration
|
<FileConfiguration
|
||||||
|
|
Loading…
Reference in New Issue