diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-12 15:27:39 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-12 15:27:39 +0000 |
| commit | 77a7d0656299fa84d1229af4f852fe2a52e567bd (patch) | |
| tree | 09134abd8c40e27c88895ed95f9ae7d574c8787e | |
| parent | 51880359b5691632c2f668b188f5837b55f40fe5 (diff) | |
| download | hercules-77a7d0656299fa84d1229af4f852fe2a52e567bd.tar.gz hercules-77a7d0656299fa84d1229af4f852fe2a52e567bd.tar.bz2 hercules-77a7d0656299fa84d1229af4f852fe2a52e567bd.tar.xz hercules-77a7d0656299fa84d1229af4f852fe2a52e567bd.zip | |
Fixed "comparison of unsigned expression < 0 is always false" warning.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16412 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/itemdb.c | 3 | ||||
| -rw-r--r-- | src/map/status.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c index cd9f9a89a..69053d7e5 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -6,6 +6,7 @@ #include "../common/random.h" #include "../common/showmsg.h" #include "../common/strlib.h" +#include "../common/utils.h" #include "itemdb.h" #include "map.h" #include "battle.h" // struct battle_config @@ -1003,7 +1004,7 @@ static bool itemdb_parse_dbrow(char** str, const char* source, int line, int scr id->type = IT_ETC; } - id->wlv = atoi(str[15]); + id->wlv = cap_value(atoi(str[15]), REFINE_TYPE_ARMOR, REFINE_TYPE_MAX); id->elv = atoi(str[16]); id->flag.no_refine = atoi(str[17]) ? 0 : 1; //FIXME: verify this id->look = atoi(str[18]); diff --git a/src/map/status.c b/src/map/status.c index 5bd894336..1a591e8e5 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -10600,9 +10600,9 @@ static int status_natural_heal_timer(int tid, unsigned int tick, int id, intptr_ * @param refine The target refine level * @return The chance to refine the item, in percent (0~100) **/ -int status_get_refine_chance(enum refine_type wlv, int refine) -{ - if (wlv < 0 || wlv > REFINE_TYPE_MAX || refine < 0 || refine >= MAX_REFINE) +int status_get_refine_chance(enum refine_type wlv, int refine) { + + if ( refine < 0 || refine >= MAX_REFINE) return 0; return refine_info[wlv].chance[refine]; |