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

(svn r82) -Fix ttd.rc issues on non VS compilers 

-Fix: network.c more robust (check for NULL pointer), if gethostbyname failes, try resolving IP address
release/0.4.5
darkvater 2004-08-19 09:37:23 +00:00
parent add3151b11
commit dd5f3bbe37
2 changed files with 172 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
network.c
View File

@ -1116,12 +1116,22 @@ void NetworkIPListInit() {
DEBUG(misc,0) ("iplist: init for host %s", hostname);
he=gethostbyname((char *) hostname);
if (he == NULL) {
DEBUG(misc, 0) ("iplist: gethostbyname failed for host %s...trying with IP address", hostname);
bcaddr = inet_addr(hostname);
he = gethostbyaddr(inet_ntoa(*(struct in_addr *)bcaddr), sizeof(bcaddr), AF_INET);
}
if (he == NULL) {
DEBUG(misc, 0) ("iplist: cannot resolve %s", hostname);
} else {
while(he->h_addr_list[i]) {
bcaddr = inet_addr(inet_ntoa(*(struct in_addr *) he->h_addr_list[i]));
_network_ip_list[i]=bcaddr;
DEBUG(misc,0) ("iplist: add %s",inet_ntoa(*(struct in_addr *) he->h_addr_list[i]));
i++;
}
}
_network_ip_list[i]=0;
}

44
ttd.rc
View File

@ -1,7 +1,5 @@
// Microsoft Visual C++ generated resource script.
//Microsoft Developer Studio generated resource script.
//
#include "resrc1.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
@ -11,7 +9,7 @@
#define APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
#include "winres.h"
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@ -32,17 +30,17 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
100 ICON "mainicon.ico"
100 ICON DISCARDABLE "mainicon.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
100 DIALOGEX 0, 0, 305, 70
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
100 DIALOG DISCARDABLE 0, 0, 305, 70
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Fatal Application Failure"
FONT 8, "MS Sans Serif", 0, 0, 0x0
FONT 8, "MS Sans Serif"
BEGIN
PUSHBUTTON "&Close",12,7,49,50,14
PUSHBUTTON "&Submit report",14,81,49,68,14,WS_DISABLED
@ -55,6 +53,7 @@ BEGIN
END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
@ -77,15 +76,18 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
VALUE "Comments", "This program is licensed under the GNU General Public License."
VALUE "CompanyName", "OpenTTD Developers"
VALUE "FileDescription", "OpenTTD"
VALUE "FileVersion", "0.3.3.0"
VALUE "InternalName", "openttd"
VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2004. All Rights Reserved."
VALUE "OriginalFilename", "openttd.exe"
VALUE "ProductName", "OpenTTD"
VALUE "ProductVersion", "0.3.3.0"
VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
VALUE "CompanyName", "OpenTTD Developers\0"
VALUE "FileDescription", "OpenTTD\0"
VALUE "FileVersion", "0.3.3.0\0"
VALUE "InternalName", "openttd\0"
VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2004. All Rights Reserved.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "openttd.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "OpenTTD\0"
VALUE "ProductVersion", "0.3.3.0\0"
VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
@ -94,6 +96,8 @@ BEGIN
END
END
#endif // !_MAC
#endif // Neutral (Default) resources
/////////////////////////////////////////////////////////////////////////////
@ -113,12 +117,12 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
// TEXTINCLUDE
//
1 TEXTINCLUDE
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resrc1.h\0"
END
2 TEXTINCLUDE
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""resource.h""\r\n"
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
@ -128,7 +132,7 @@ BEGIN
"\0"
END
3 TEXTINCLUDE
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"