diff options
| -rw-r--r-- | src/guiMainMenu.cpp | 4 | ||||
| -rw-r--r-- | src/map.h | 2 | ||||
| -rw-r--r-- | src/mapgen.h | 2 | ||||
| -rw-r--r-- | src/profiler.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 9e6b01dd6..5dc73cd96 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -43,6 +43,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "subgame.h" #define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0])) +#define LSTRING(x) LSTRING_(x) +#define LSTRING_(x) L##x const wchar_t *contrib_core_strs[] = { L"Perttu Ahola (celeron55) <celeron55@gmail.com>", @@ -760,7 +762,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) core::rect<s32> rect(0, 0, 130, 70); rect += m_topleft_client + v2s32(35, 160); Environment->addStaticText( - L"Minetest " VERSION_STRING "\nhttp://minetest.net/", + L"Minetest " LSTRING(VERSION_STRING) L"\nhttp://minetest.net/", rect, false, true, this, -1); } { @@ -50,7 +50,7 @@ class NodeMetadata; class IGameDef; class IRollbackReportSink; class EmergeManager; -class BlockMakeData; +struct BlockMakeData; /* diff --git a/src/mapgen.h b/src/mapgen.h index f4bd659fb..2e917a3aa 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -45,7 +45,7 @@ class MapBlock; class ManualMapVoxelManipulator; class VoxelManipulator; class INodeDefManager; -class BlockMakeData; +struct BlockMakeData; class VoxelArea; struct MapgenParams { diff --git a/src/profiler.h b/src/profiler.h index 56b026880..271ad70c1 100644 --- a/src/profiler.h +++ b/src/profiler.h @@ -73,7 +73,7 @@ public: else{ /* No add shall have been used */ assert(n->second != -2); - n->second = std::max(n->second, 0) + 1; + n->second = (std::max)(n->second, 0) + 1; } } { |