summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-12-20 18:32:32 -0800
committerBen Longbons <b.r.longbons@gmail.com>2012-12-24 10:02:19 -0800
commit2b092c150e1226decc48160316070fc44d5fbba0 (patch)
tree48456d14896059fd223401aa15d4e29010a81436 /src/char
parentb52127bcbf817ff8285b36d22198b275327e16bb (diff)
downloadtmwa-2b092c150e1226decc48160316070fc44d5fbba0.tar.gz
tmwa-2b092c150e1226decc48160316070fc44d5fbba0.tar.bz2
tmwa-2b092c150e1226decc48160316070fc44d5fbba0.tar.xz
tmwa-2b092c150e1226decc48160316070fc44d5fbba0.zip
Enumify option, opt1, opt2, and opt3
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 4091b7d..899461a 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -360,7 +360,7 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p)
p->luk = tmp_int[18];
p->status_point = tmp_int[19];
p->skill_point = tmp_int[20];
- p->option = tmp_int[21];
+ p->option = Option(tmp_int[21]);
p->karma = tmp_int[22];
p->manner = tmp_int[23];
p->party_id = tmp_int[24];
@@ -966,7 +966,7 @@ int make_new_char(int fd, unsigned char *dat)
char_dat[i].sp = char_dat[i].max_sp;
char_dat[i].status_point = 0;
char_dat[i].skill_point = 0;
- char_dat[i].option = 0;
+ char_dat[i].option = Option(0x0000);
char_dat[i].karma = 0;
char_dat[i].manner = 0;
char_dat[i].party_id = 0;
@@ -1577,7 +1577,7 @@ int mmo_char_send006b(int fd, struct char_session_data *sd)
WFIFOW(fd, j + 22) = find_equip_view(p, 0x0004); // 10: gloves
WFIFOW(fd, j + 24) = find_equip_view(p, 0x0008); // 11: cape
WFIFOW(fd, j + 26) = find_equip_view(p, 0x0010); // 12: misc1
- WFIFOL(fd, j + 28) = p->option;
+ WFIFOL(fd, j + 28) = uint16_t(p->option);
WFIFOL(fd, j + 32) = p->karma;
WFIFOL(fd, j + 36) = p->manner;