summaryrefslogtreecommitdiff
path: root/src/map/atcommand.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-02-04 00:49:50 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-02-07 12:54:23 -0800
commitc67c2b7435a13d7ce17b2075e22dc5c6036f702a (patch)
treeb84b7b205a361b39d65944a9edb2a353356a9ac9 /src/map/atcommand.cpp
parentb3a0b3e7c94bce46bc0654528df0748cf0c2a6ac (diff)
downloadtmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.gz
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.bz2
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.xz
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.zip
Remove some more Skill-related stuff
Diffstat (limited to 'src/map/atcommand.cpp')
-rw-r--r--src/map/atcommand.cpp43
1 files changed, 22 insertions, 21 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 211baac..a6994d5 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -1594,7 +1594,7 @@ int atcommand_heal(const int fd, struct map_session_data *sd,
}
if (hp < 0) // display like damage
- clif_damage(&sd->bl, &sd->bl, gettick(), 0, 0, -hp, 0, 4, 0);
+ clif_damage(&sd->bl, &sd->bl, gettick(), 0, 0, -hp, 0, DamageType::RETURNED, 0);
if (hp != 0 || sp != 0)
{
@@ -4614,11 +4614,10 @@ int atcommand_mapinfo(const int fd, struct map_session_data *sd,
struct npc_data *nd = NULL;
struct chat_data *cd = NULL;
char map_name[100];
- char direction[12];
+ const char *direction = NULL;
int m_id, i, chat_num, list = 0;
memset(map_name, '\0', sizeof(map_name));
- memset(direction, '\0', sizeof(direction));
sscanf(message, "%d %99[^\n]", &list, map_name);
@@ -4716,35 +4715,37 @@ int atcommand_mapinfo(const int fd, struct map_session_data *sd,
nd = map[m_id].npc[i];
switch (nd->dir)
{
- case 0:
- strcpy(direction, "North");
+ case DIR_S:
+ direction = "North";
break;
- case 1:
- strcpy(direction, "North West");
+ case DIR_SW:
+ direction = "North West";
break;
- case 2:
- strcpy(direction, "West");
+ case DIR_W:
+ direction = "West";
break;
- case 3:
- strcpy(direction, "South West");
+ case DIR_NW:
+ direction = "South West";
break;
- case 4:
- strcpy(direction, "South");
+ case DIR_N:
+ direction = "South";
break;
- case 5:
- strcpy(direction, "South East");
+ case DIR_NE:
+ direction = "South East";
break;
- case 6:
- strcpy(direction, "East");
+ case DIR_E:
+ direction = "East";
break;
- case 7:
- strcpy(direction, "North East");
+ case DIR_SE:
+ direction = "North East";
break;
+#if 0
case 9:
- strcpy(direction, "North");
+ direction = "North";
break;
+#endif
default:
- strcpy(direction, "Unknown");
+ direction = "Unknown";
break;
}
output = STRPRINTF(