mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 05:13:59 +02:00
Code Issues Projects Releases Wiki Activity

Renamed environment variables

Browse Source
This commit is contained in:
mathusummut
2018-11-02 12:28:43 +01:00
parent 69ab9716da
commit c0bc0c40c2
12 changed files with 59 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/shared_lib/sources/platform/posix/socket.cpp
View File

@@ -3144,20 +3144,6 @@ namespace Shared {
if(debugPingOutput) printf("Running cmd [%s] got [%s]\n",szCmd,buf);
// Linux
//softcoder@softhauslinux:~/Code/megaglest/trunk/mk/linux$ ping -c 5 soft-haus.com
//PING soft-haus.com (65.254.250.110) 56(84) bytes of data.
//64 bytes from 65-254-250-110.yourhostingaccount.com (65.254.250.110): icmp_seq=1 ttl=242 time=133 ms
//64 bytes from 65-254-250-110.yourhostingaccount.com (65.254.250.110): icmp_seq=2 ttl=242 time=137 ms
//
// Windows XP
//C:\Code\megaglest\trunk\data\glest_game>ping -n 5 soft-haus.com
//
//Pinging soft-haus.com [65.254.250.110] with 32 bytes of data:
//
//Reply from 65.254.250.110: bytes=32 time=125ms TTL=242
//Reply from 65.254.250.110: bytes=32 time=129ms TTL=242
std::string str = buf;
std::string::size_type ms_pos = 0;
int count = 0;

24
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -229,22 +229,22 @@ namespace Shared {
#ifndef WIN32
string mg_icon_file = "";
#if defined(DATADIR)
if (fileExists(formatPath(TOSTRING(DATADIR)) + "megaglest.png")) {
mg_icon_file = formatPath(TOSTRING(DATADIR)) + "megaglest.png";
} else if (fileExists(formatPath(TOSTRING(DATADIR)) + "megaglest.bmp")) {
mg_icon_file = formatPath(TOSTRING(DATADIR)) + "megaglest.bmp";
if (fileExists(formatPath(TOSTRING(DATADIR)) + "zetaglest.png")) {
mg_icon_file = formatPath(TOSTRING(DATADIR)) + "zetaglest.png";
} else if (fileExists(formatPath(TOSTRING(DATADIR)) + "zetaglest.bmp")) {
mg_icon_file = formatPath(TOSTRING(DATADIR)) + "zetaglest.bmp";
}
#endif
if (mg_icon_file == "" && fileExists("megaglest.png")) {
mg_icon_file = "megaglest.png";
} else if (mg_icon_file == "" && fileExists("megaglest.bmp")) {
mg_icon_file = "megaglest.bmp";
} else if (mg_icon_file == "" && fileExists("/usr/share/pixmaps/megaglest.png")) {
mg_icon_file = "/usr/share/pixmaps/megaglest.png";
} else if (mg_icon_file == "" && fileExists("/usr/share/pixmaps/megaglest.bmp")) {
mg_icon_file = "/usr/share/pixmaps/megaglest.bmp";
if (mg_icon_file == "" && fileExists("zetaglest.png")) {
mg_icon_file = "zetaglest.png";
} else if (mg_icon_file == "" && fileExists("zetaglest.bmp")) {
mg_icon_file = "zetaglest.bmp";
} else if (mg_icon_file == "" && fileExists("/usr/share/pixmaps/zetaglest.png")) {
mg_icon_file = "/usr/share/pixmaps/zetaglest.png";
} else if (mg_icon_file == "" && fileExists("/usr/share/pixmaps/zetaglest.bmp")) {
mg_icon_file = "/usr/share/pixmaps/zetaglest.bmp";
}
if (mg_icon_file != "") {