diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/login/login.c | 2 | ||||
| -rw-r--r-- | src/login_sql/login.c | 4 | ||||
| -rw-r--r-- | src/map/mob.c | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 48e007584..acee5c4bb 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -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.
2006/05/28
+ * Changed the mob drop rate adjust function to receive a signed int
+ argument. Probably will fix those drops with 0% becoming 100% [Skotlex]
* Corrected Musical Strike having a different damage equation from Throw
Arrow. [Skotlex]
* Added state rewarp to players. It gets set when a pc_setpos call is
diff --git a/src/login/login.c b/src/login/login.c index 197c40dda..a472b3216 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -175,6 +175,8 @@ int use_md5_passwds = 0; int console = 0;
+int charif_sendallwos(int sfd, unsigned char *buf, unsigned int len);
+
//------------------------------
// Writing function of logs file
//------------------------------
diff --git a/src/login_sql/login.c b/src/login_sql/login.c index 7bc4d124e..d26e0cd04 100644 --- a/src/login_sql/login.c +++ b/src/login_sql/login.c @@ -159,6 +159,8 @@ static void* create_online_user(DBKey key, va_list args) { return p;
}
+int charif_sendallwos(int sfd, unsigned char *buf, unsigned int len);
+
//-----------------------------------------------------
// Online User Database [Wizputer]
//-----------------------------------------------------
@@ -237,8 +239,6 @@ void read_gm_account(void) { }
}
-int charif_sendallwos(int sfd, unsigned char *buf, unsigned int len);
-
//-----------------------------------------------------
// Send GM accounts to all char-server
//-----------------------------------------------------
diff --git a/src/map/mob.c b/src/map/mob.c index 2b1673687..ab195ecac 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3060,7 +3060,7 @@ static int mob_makedummymobdb(int class_) } //Adjusts the drop rate of item according to the criteria given. [Skotlex] -static unsigned int mob_drop_adjust(unsigned int rate, int rate_adjust, unsigned short rate_min, unsigned short rate_max) +static unsigned int mob_drop_adjust(int rate, int rate_adjust, unsigned short rate_min, unsigned short rate_max) { if (battle_config.logarithmic_drops && rate_adjust > 0) //Logarithmic drops equation by Ishizu-Chan //Equation: Droprate(x,y) = x * (5 - log(x)) ^ (ln(y) / ln(5)) @@ -3068,7 +3068,7 @@ static unsigned int mob_drop_adjust(unsigned int rate, int rate_adjust, unsigned rate = (int)(rate * pow((5.0 - log10(rate)), (log(rate_adjust/100.) / log(5.0))) + 0.5); else //Classical linear rate adjustment. rate = rate*rate_adjust/100; - return (rate>rate_max)?rate_max:((rate<rate_min)?rate_min:rate); + return cap_value(rate,rate_min,rate_max); } /*========================================== * mob_db.txt reading |