summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/itemdb.cpp6
-rw-r--r--src/map/itemdb.hpp3
-rw-r--r--src/map/magic-v2.cpp2
3 files changed, 3 insertions, 8 deletions
diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp
index 1822b8a..b1a1a30 100644
--- a/src/map/itemdb.cpp
+++ b/src/map/itemdb.cpp
@@ -21,12 +21,6 @@
#include "../poison.hpp"
-constexpr int MAX_RANDITEM = 2000;
-
-// ** ITEMDB_OVERRIDE_NAME_VERBOSE **
-// 定義すると、itemdb.txtとgrfで名前が異なる場合、表示します.
-//#define ITEMDB_OVERRIDE_NAME_VERBOSE 1
-
static
Map<int, struct item_data> item_db;
diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp
index 624030e..ab06189 100644
--- a/src/map/itemdb.hpp
+++ b/src/map/itemdb.hpp
@@ -33,7 +33,8 @@ struct random_item_data
int per;
};
-struct item_data *itemdb_searchname(ItemName name) = delete;
+inline
+struct item_data *itemdb_searchname(ItemName) = delete;
struct item_data *itemdb_searchname(XString name);
struct item_data *itemdb_search(int nameid);
struct item_data *itemdb_exists(int nameid);
diff --git a/src/map/magic-v2.cpp b/src/map/magic-v2.cpp
index b10df3f..9fb5001 100644
--- a/src/map/magic-v2.cpp
+++ b/src/map/magic-v2.cpp
@@ -411,7 +411,7 @@ namespace magic_v2
case sexpr::TOKEN:
{
ZString dirs[8] = {
- "S", "SW", "W", "NW", "N", "NE", "E", "SE",
+ ZString("S"), ZString("SW"), ZString("W"), ZString("NW"), ZString("N"), ZString("NE"), ZString("E"), ZString("SE"),
};
auto begin = std::begin(dirs);
auto end = std::end(dirs);