diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-01-29 20:07:39 -0500 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2016-02-08 18:53:29 -0600 |
| commit | 8b0d94a35c472e19cfd68c5ac7ec1dd5932201d4 (patch) | |
| tree | d5c7851d716a1914cff9403bcc1764eb69fd758d | |
| parent | f593049cd8286f48497782d8bc0afe787724ad5d (diff) | |
| download | tmwa-8b0d94a35c472e19cfd68c5ac7ec1dd5932201d4.tar.gz tmwa-8b0d94a35c472e19cfd68c5ac7ec1dd5932201d4.tar.bz2 tmwa-8b0d94a35c472e19cfd68c5ac7ec1dd5932201d4.tar.xz tmwa-8b0d94a35c472e19cfd68c5ac7ec1dd5932201d4.zip | |
allow to not allocate stats on CC
do not use sex provided by client for scripts
send the correct sex to the client
| -rw-r--r-- | src/map/clif.cpp | 6 | ||||
| -rw-r--r-- | src/map/pc.cpp | 2 | ||||
| -rwxr-xr-x | tools/config.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 64e9939..9743e49 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -659,7 +659,7 @@ void clif_set0078_main_1d8(dumb_ptr<map_session_data> sd, Buffer& buf) fixed_1d8.manner = sd->status.manner; fixed_1d8.opt3 = sd->opt3; fixed_1d8.karma = sd->status.karma; - fixed_1d8.sex = sd->sex; + fixed_1d8.sex = sd->status.sex; fixed_1d8.pos.x = sd->bl_x; fixed_1d8.pos.y = sd->bl_y; fixed_1d8.pos.dir = sd->dir; @@ -713,7 +713,7 @@ void clif_set0078_alt_1d9(dumb_ptr<map_session_data> sd, Buffer& buf) fixed_1d8.manner = sd->status.manner; fixed_1d8.opt3 = sd->opt3; fixed_1d8.karma = sd->status.karma; - fixed_1d8.sex = sd->sex; + fixed_1d8.sex = sd->status.sex; fixed_1d8.pos.x = sd->bl_x; fixed_1d8.pos.y = sd->bl_y; fixed_1d8.pos.dir = sd->dir; @@ -766,7 +766,7 @@ void clif_set007b(dumb_ptr<map_session_data> sd, Buffer& buf) fixed_1da.manner = sd->status.manner; fixed_1da.opt3 = sd->opt3; fixed_1da.karma = sd->status.karma; - fixed_1da.sex = sd->sex; + fixed_1da.sex = sd->status.sex; fixed_1da.pos2.x0 = sd->bl_x; fixed_1da.pos2.y0 = sd->bl_y; fixed_1da.pos2.x1 = sd->to_x; diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 8a5127d..59fbba6 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -3361,7 +3361,7 @@ int pc_readparam(dumb_ptr<map_session_data> sd, SP type) val = unwrap<Species>(sd->status.species); break; case SP::SEX: - val = static_cast<uint8_t>(sd->sex); + val = static_cast<uint8_t>(sd->status.sex); break; case SP::WEIGHT: val = sd->weight; diff --git a/tools/config.py b/tools/config.py index cedaa3a..0892973 100755 --- a/tools/config.py +++ b/tools/config.py @@ -555,9 +555,9 @@ def build_config(): char_conf.opt('max_hair_style', u16, '20', min=1) char_conf.opt('max_hair_color', u16, '11', min=1) char_conf.opt('min_stat_value', u16, '1') - char_conf.opt('max_stat_value', u16, '9', min=2) - char_conf.opt('total_stat_sum', u16, '30', min=7) - char_conf.opt('min_name_length', u16, '4', min=1) + char_conf.opt('max_stat_value', u16, '9', min=1) + char_conf.opt('total_stat_sum', u16, '30', min=6) + char_conf.opt('min_name_length', u16, '4', min=4) char_conf.opt('char_slots', u16, '9', min=1) char_conf.opt('anti_freeze_enable', bool, 'false') char_conf.opt('anti_freeze_interval', seconds, '6_s', min='5_s') |