diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-10 15:31:24 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-23 21:07:14 -0700 |
| commit | 1c1752f40aac20bf9a5e56817951a013c2219bed (patch) | |
| tree | d4ca348dd88ec08cf4edbdd37b72396b75a914a4 /src/map/pc.cpp | |
| parent | 8ce2f240dba5bdd0ca47ac25f16f140d8d1744fc (diff) | |
| download | tmwa-1c1752f40aac20bf9a5e56817951a013c2219bed.tar.gz tmwa-1c1752f40aac20bf9a5e56817951a013c2219bed.tar.bz2 tmwa-1c1752f40aac20bf9a5e56817951a013c2219bed.tar.xz tmwa-1c1752f40aac20bf9a5e56817951a013c2219bed.zip | |
Generate the map server protocol
Sigh, map server will have no smart filters yet
Diffstat (limited to 'src/map/pc.cpp')
| -rw-r--r-- | src/map/pc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.cpp b/src/map/pc.cpp index ac8af28..33cb57f 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -472,7 +472,7 @@ void pc_makesavestatus(dumb_ptr<map_session_data> sd) *------------------------------------------ */ int pc_setnewpc(dumb_ptr<map_session_data> sd, AccountId account_id, CharId char_id, - int login_id1, tick_t client_tick, SEX sex) + int login_id1, uint32_t client_tick, SEX sex) { nullpo_ret(sd); @@ -485,7 +485,7 @@ int pc_setnewpc(dumb_ptr<map_session_data> sd, AccountId account_id, CharId char // Possible fix: char send auth before client is allowed to know my IP? sd->login_id1 = login_id1; sd->login_id2 = 0; // at this point, we can not know the value :( - sd->client_tick = client_tick; + (void)client_tick; sd->sex = sex; sd->state.auth = 0; sd->bl_type = BL::PC; @@ -912,7 +912,7 @@ void pc_set_weapon_look(dumb_ptr<map_session_data> sd) { if (sd->attack_spell_override) clif_changelook(sd, LOOK::WEAPON, - sd->attack_spell_look_override); + unwrap<ItemNameId>(sd->attack_spell_look_override)); else clif_changelook(sd, LOOK::WEAPON, static_cast<uint16_t>(sd->status.weapon)); |