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

Updated selection mechanism

Browse Source
This commit is contained in:
mathusummut
2019-02-01 04:31:10 +01:00
parent fa0ae69220
commit 66383eaa54
29 changed files with 184 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/sources/feathery_ftp/ftpCmds.c
View File

@@ -456,7 +456,7 @@ LOCAL int ftpCmdRetr(int sessionId, const char* args, int len) {
if (ftpIsClientAllowedToGetFile != NULL) {
if (ftpIsClientAllowedToGetFile(ftpGetSession(sessionId)->remoteIp, ftpFindAccountById(ftpGetSession(sessionId)->userId), realPath) != 1) {
if (VERBOSE_MODE_ENABLED) printf("ERROR In ftpCmdRetr FILE DISALLOWED By MGserver [file not available] args [%s] realPath [%s]\n", args, realPath);
if (VERBOSE_MODE_ENABLED) printf("ERROR In ftpCmdRetr FILE DISALLOWED By server [file not available] args [%s] realPath [%s]\n", args, realPath);
ftpSendMsg(MSG_NORMAL, sessionId, 550, ftpMsg032);
return 2;

14
source/shared_lib/sources/graphics/font.cpp
View File

@@ -609,11 +609,11 @@ namespace Shared {
}
// Get user-specified font path
string glest_font = safeCharPtrCopy(getenv("GAME_FONT"), 8095);
string glest_font_family = safeCharPtrCopy(getenv("GAME_FONT_FAMILY"), 8095);
if (glest_font != "" || glest_font_family != "") {
if (glest_font != "") {
tryFont = glest_font;
string game_font = safeCharPtrCopy(getenv("GAME_FONT"), 8095);
string game_font_family = safeCharPtrCopy(getenv("GAME_FONT_FAMILY"), 8095);
if (game_font != "" || game_font_family != "") {
if (game_font != "") {
tryFont = game_font;
if (Text::DEFAULT_FONT_PATH_ABSOLUTE != "") {
tryFont = Text::DEFAULT_FONT_PATH_ABSOLUTE + "/" + extractFileFromDirectoryPath(tryFont);
@@ -622,9 +622,9 @@ namespace Shared {
replaceAll(tryFont, "/", "\\");
#endif
CHECK_FONT_PATH(tryFont.c_str(), glest_font_family.c_str(), &font, &path);
CHECK_FONT_PATH(tryFont.c_str(), game_font_family.c_str(), &font, &path);
} else {
CHECK_FONT_PATH(NULL, glest_font_family.c_str(), &font, &path);
CHECK_FONT_PATH(NULL, game_font_family.c_str(), &font, &path);
}
}

3
source/shared_lib/sources/map/map_preview.cpp
View File

@@ -129,8 +129,7 @@ namespace Shared {
#endif
}
void MapPreview::glestChangeHeight(int x, int y, int height, int radius) {
void MapPreview::changeHeight(int x, int y, int height, int radius) {
for (int i = x - radius + 1; i < x + radius; i++) {
for (int j = y - radius + 1; j < y + radius; j++) {
if (inside(i, j)) {

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

@@ -254,7 +254,6 @@ namespace Shared {
icon = NULL;
}
//printf("Loading icon [%s]\n",mg_icon_file.c_str());
if (extractExtension(icon_file) == "bmp") {
icon = SDL_LoadBMP(icon_file.c_str());
} else {