map hash

as it was not possible to store a string variable with the current
format of the athena.txt I though a hash could help to identify the maps
since this one can be stored as a permanent char bound variable in
athena.txt

3 files changed, 53 insertions, 0 deletions

diff --git a/src/map/map.cpp b/src/map/map.cpp
index ff69a56..f8e8bea 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -1241,6 +1241,20 @@ int map_setipport(MapName name, IP4Address ip, int port)
 }
 
 /*==========================================
+ * creates a hash of a map name
+ *------------------------------------------
+ */
+int map_create_hash(XString str) {
+    const int k = 67;
+    const int m = 3067;
+    int hash = 0;
+    for (int i = 0; i < str.size(); i++) {
+        hash += (str[i] * (int)pow(k, i)) % m;
+    }
+    return hash;
+}
+
+/*==========================================
  * マップ1枚読み込み
  *------------------------------------------
  */
@@ -1265,6 +1279,9 @@ bool map_readmap(map_local *m, size_t num, MapName fn)
 
     m->npc_num = 0;
     m->users = 0;
+
+    m->hash = map_create_hash(fn);
+
     really_memzero_this(&m->flag);
     if (battle_config.pk_mode)
         m->flag.set(MapFlag::PVP, 1);
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 56d07a5..de0e10b 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -531,6 +531,7 @@ struct map_local : map_abstract
     Point save;
     Point resave;
     int mask;
+    int hash;
     Array<dumb_ptr<npc_data>, MAX_NPC_PER_MAP> npc;
 };
 
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 1efa006..74a70b3 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -5524,6 +5524,39 @@ void builtin_getmapmaxy(ScriptState *st)
 }
 
 /*==========================================
+ * Get the hash of a map
+ *------------------------------------------
+ */
+static
+void builtin_getmaphash(ScriptState *st)
+{
+    MapName mapname = stringish<MapName>(ZString(conv_str(st, &AARG(0))));
+    P<map_local> m = TRY_UNWRAP(map_mapname2mapid(mapname), return);
+    push_int<ScriptDataInt>(st->stack, m->hash);
+}
+
+/*==========================================
+ * Get the map name from a hash
+ *------------------------------------------
+ */
+static
+void builtin_getmapnamefromhash(ScriptState *st)
+{
+    int hash = conv_num(st, &AARG(0));
+    MapName mapname;
+    for (auto& mit : maps_db)
+    {
+        map_local *ml = static_cast<map_local *>(mit.second.get());
+        if (ml->hash == hash)
+        {
+            mapname = ml->name_;
+            break;
+        }
+    }
+    push_str<ScriptDataStr>(st->stack, mapname);
+}
+
+/*==========================================
  * Get the NPC's info
  *------------------------------------------
  */
@@ -5787,6 +5820,8 @@ BuiltinFunction builtin_functions[] =
     BUILTIN(getmap, "?"_s, 's'),
     BUILTIN(getmapmaxx, "M"_s, 'i'),
     BUILTIN(getmapmaxy, "M"_s, 'i'),
+    BUILTIN(getmaphash, "M"_s, 'i'),
+    BUILTIN(getmapnamefromhash, "i"_s, 's'),
     BUILTIN(mapexit, ""_s, '\0'),
     BUILTIN(freeloop, "i"_s, '\0'),
     BUILTIN(if_then_else, "iii"_s, 'v'),