Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed cart-termination crashing the server if you used level 16 of it.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7606 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-07-11 00:51:01 +00:00
parent f88913a9f0
commit 1c286a8da4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/10 2006/07/10
* Fixed cart-termination crashing the server if you used level 16 of it.
[Skotlex]
* Fixed check_connect_login_server check in char-sql server. Fixes * Fixed check_connect_login_server check in char-sql server. Fixes
char-server not reconnecting to the login server. [Skotlex] char-server not reconnecting to the login server. [Skotlex]
* Login-sql server will no longer change an account's state to "7" when * Login-sql server will no longer change an account's state to "7" when

6
src/map/battle.c
View File

@ -1421,10 +1421,12 @@ static struct Damage battle_calc_weapon_attack(
skillratio += 30*skill_lv; skillratio += 30*skill_lv;
break; break;
case WS_CARTTERMINATION: case WS_CARTTERMINATION:
i = (10 * (16 - skill_lv));
if (i < 1) i = 1;
if(sd && sd->cart_weight > 0) if(sd && sd->cart_weight > 0)
skillratio += sd->cart_weight / (10 * (16 - skill_lv)) - 100; skillratio += sd->cart_weight / i - 100;
else if (!sd) else if (!sd)
skillratio += battle_config.max_cart_weight / (10 * (16 - skill_lv)); skillratio += battle_config.max_cart_weight / i - 100;
flag.cardfix = 0; flag.cardfix = 0;
break; break;
case TK_DOWNKICK: case TK_DOWNKICK: