diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-01-08 19:35:14 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-01-08 19:35:14 +0200 |
| commit | eb476f1ce2c559136f8e7d652ebe3084a6ba8dc2 (patch) | |
| tree | 6e88df245a5651b535b4b2eab72d54a90d034509 /src | |
| parent | 340de48dbfc5e9aecb6ef540b3d5d3e333bbbaa4 (diff) | |
| download | minetest-eb476f1ce2c559136f8e7d652ebe3084a6ba8dc2.tar.gz minetest-eb476f1ce2c559136f8e7d652ebe3084a6ba8dc2.tar.bz2 minetest-eb476f1ce2c559136f8e7d652ebe3084a6ba8dc2.zip | |
Lots of small stuff
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/config.h.in | 3 | ||||
| -rw-r--r-- | src/debug.h | 4 | ||||
| -rw-r--r-- | src/map.cpp | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f5c3ed93b..fea1f2644 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -135,7 +135,9 @@ endif(BUILD_SERVER) if( UNIX ) # Unix - set(UNIX_FLAGS "-Wall") + # NOTE: -Wall gets applied automatically to debug builds + + #set(UNIX_FLAGS "") if(BUILD_CLIENT) set_target_properties(minetest PROPERTIES COMPILE_FLAGS diff --git a/src/config.h.in b/src/config.h.in index 8ac690874..9f65386c2 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -4,7 +4,8 @@ #define CONFIG_H #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" -#define BUILD_INFO "BUILD_DATE=@BUILD_DATE@ RUN_IN_PLACE=@RUN_IN_PLACE@ INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@" +#define VERSION_STRING "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@" +#define BUILD_INFO "VER="VERSION_STRING" BUILD_DATE=@BUILD_DATE@ RUN_IN_PLACE=@RUN_IN_PLACE@ INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@" #endif diff --git a/src/debug.h b/src/debug.h index 8faa65eb8..1973bb510 100644 --- a/src/debug.h +++ b/src/debug.h @@ -76,7 +76,7 @@ public: if(g_debugstreams[i] == stderr && m_disable_stderr) continue; if(g_debugstreams[i] != NULL) - fwrite(&c, 1, 1, g_debugstreams[i]); + (void)fwrite(&c, 1, 1, g_debugstreams[i]); //TODO: Is this slow? fflush(g_debugstreams[i]); } @@ -90,7 +90,7 @@ public: if(g_debugstreams[i] == stderr && m_disable_stderr) continue; if(g_debugstreams[i] != NULL) - fwrite(s, 1, n, g_debugstreams[i]); + (void)fwrite(s, 1, n, g_debugstreams[i]); //TODO: Is this slow? fflush(g_debugstreams[i]); } diff --git a/src/map.cpp b/src/map.cpp index 4780bf4ec..f5e490ad4 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1804,7 +1804,7 @@ continue_generating: /* Don't always generate dungeon */ - if(found_existing || rand() % 3 == 0) + if(found_existing || rand() % 2 == 0) { /* Generate some tunnel starting from orp and ors |