From 4e89085e113c63de223cbcfe78cbff1b60f95199 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Tue, 27 Aug 2013 19:36:36 -0700
Subject: Fix bug with mapnames being falsy

Fixes #7
---
 src/map/chrif.cpp | 2 +-
 src/map/mob.cpp   | 2 +-
 src/map/pc.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/map')

diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index 126235c..33a9879 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -674,7 +674,7 @@ int chrif_saveaccountreg2(dumb_ptr<map_session_data> sd)
     for (j = 0; j < sd->status.account_reg2_num; j++)
     {
         struct global_reg *reg = &sd->status.account_reg2[j];
-        if (reg->str[0] && reg->value != 0)
+        if (reg->str && reg->value != 0)
         {
             WFIFO_STRING(char_fd, p, reg->str, 32);
             WFIFOL(char_fd, p + 32) = reg->value;
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index ebd336f..cd548a4 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -76,7 +76,7 @@ int mobdb_searchname(MobName str)
 int mobdb_checkid(const int id)
 {
     if (id <= 0 || id >= (sizeof(mob_db) / sizeof(mob_db[0]))
-        || mob_db[id].name[0] == '\0')
+        || !mob_db[id].name)
         return 0;
 
     return id;
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index b683474..e34f765 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -2354,7 +2354,7 @@ int pc_setpos(dumb_ptr<map_session_data> sd,
         while (bool(read_gatp(m, x, y) & MapCell::UNWALKABLE));
     }
 
-    if (sd->mapname_[0] && sd->bl_prev != NULL)
+    if (sd->mapname_ && sd->bl_prev != NULL)
     {
         clif_clearchar(sd, clrtype);
         map_delblock(sd);
-- 
cgit v1.2.3-70-g09d2