diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-27 19:36:36 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-28 09:17:26 -0700 |
commit | 4e89085e113c63de223cbcfe78cbff1b60f95199 (patch) | |
tree | bb4acecd7d338633bd84dbb8a00f38df71972013 /src/map | |
parent | 61dc59e612df9c6d2b3a3f4f27f1cb88b6fca98b (diff) | |
download | tmwa-4e89085e113c63de223cbcfe78cbff1b60f95199.tar.gz tmwa-4e89085e113c63de223cbcfe78cbff1b60f95199.tar.bz2 tmwa-4e89085e113c63de223cbcfe78cbff1b60f95199.tar.xz tmwa-4e89085e113c63de223cbcfe78cbff1b60f95199.zip |
Fix bug with mapnames being falsy
Fixes #7
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/chrif.cpp | 2 | ||||
-rw-r--r-- | src/map/mob.cpp | 2 | ||||
-rw-r--r-- | src/map/pc.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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); |