mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r1262) -Fix: [1088996] kill some warnings for MinGW (luzi82)

release/0.4.5
darkvater 2004-12-23 20:23:05 +00:00
parent c330e4203e
commit ffed7d6834
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
airport_gui.c
View File

@ -122,11 +122,10 @@ void ShowBuildAirToolbar()
static void BuildAirportPickerWndProc(Window *w, WindowEvent *e) static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
{ {
int rad;
switch(e->event) { switch(e->event) {
case WE_PAINT: { case WE_PAINT: {
int sel; int sel;
int rad = 4; // default catchment radious
if (WP(w,def_d).close) if (WP(w,def_d).close)
return; return;
@ -154,12 +153,8 @@ static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
case AT_LARGE: rad = CA_AIR_LARGE; break; case AT_LARGE: rad = CA_AIR_LARGE; break;
case AT_METROPOLITAN: rad = CA_AIR_METRO; break; case AT_METROPOLITAN: rad = CA_AIR_METRO; break;
case AT_INTERNATIONAL: rad = CA_AIR_INTER; break; case AT_INTERNATIONAL: rad = CA_AIR_INTER; break;
default: rad = 4; break;
} }
} else { }
rad = 4;
}
if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);

6
network_core.h
View File

@ -12,7 +12,11 @@
# include <windows.h> # include <windows.h>
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
# pragma comment (lib, "ws2_32.lib")
#ifdef _MSC_VER
#pragma comment (lib, "ws2_32.lib")
#endif //_MSC_VER
# define ENABLE_NETWORK // On windows, the network is always enabled # define ENABLE_NETWORK // On windows, the network is always enabled
# define GET_LAST_ERROR() WSAGetLastError() # define GET_LAST_ERROR() WSAGetLastError()
# define EWOULDBLOCK WSAEWOULDBLOCK # define EWOULDBLOCK WSAEWOULDBLOCK

4
win32.c
View File

@ -1533,7 +1533,7 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
if (h != INVALID_HANDLE_VALUE) { if (h != INVALID_HANDLE_VALUE) {
do { do {
if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY && if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY &&
!(fd.cFileName[0]=='.' && (fd.cFileName[1]==0 || fd.cFileName[1]=='.' && fd.cFileName[2]==0))) { !(fd.cFileName[0] == '.' && (fd.cFileName[1] == 0 || (fd.cFileName[1] == '.' && fd.cFileName[2] == 0)))) {
fios = FiosAlloc(); fios = FiosAlloc();
fios->type = FIOS_TYPE_DIR; fios->type = FIOS_TYPE_DIR;
strcpy(fios->name, fd.cFileName); strcpy(fios->name, fd.cFileName);
@ -1631,7 +1631,7 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
if (h != INVALID_HANDLE_VALUE && mode != SLD_NEW_GAME) { if (h != INVALID_HANDLE_VALUE && mode != SLD_NEW_GAME) {
do { do {
if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY && if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY &&
!(fd.cFileName[0]=='.' && (fd.cFileName[1]==0 || fd.cFileName[1]=='.' && fd.cFileName[2]==0))) { !(fd.cFileName[0] == '.' && (fd.cFileName[1] == 0 || (fd.cFileName[1] == '.' && fd.cFileName[2] == 0)))) {
fios = FiosAlloc(); fios = FiosAlloc();
fios->type = FIOS_TYPE_DIR; fios->type = FIOS_TYPE_DIR;
strcpy(fios->name, fd.cFileName); strcpy(fios->name, fd.cFileName);