summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-07 13:48:54 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-07 13:48:54 +0000
commitbda4ddd3612d2ba0d6abf62bb2ccf4c9f3b33e2b (patch)
tree91ec492c387e7e9886e1c74c6953f34530c2a3e9 /src/char
parent2479f55a86fc2919805e4f38f6ae556f2f045fd4 (diff)
downloadhercules-bda4ddd3612d2ba0d6abf62bb2ccf4c9f3b33e2b.tar.gz
hercules-bda4ddd3612d2ba0d6abf62bb2ccf4c9f3b33e2b.tar.bz2
hercules-bda4ddd3612d2ba0d6abf62bb2ccf4c9f3b33e2b.tar.xz
hercules-bda4ddd3612d2ba0d6abf62bb2ccf4c9f3b33e2b.zip
- Fixed signed/unsigned comparison issues in the char txt/sql server.
- Fixed the cooking success chances. Thanks to Ishizu Chan. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7560 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
-rw-r--r--src/char/int_party.c6
-rw-r--r--src/char/inter.c6
-rw-r--r--src/char/inter.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 0c1608361..b0cedabe6 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -35,7 +35,8 @@ int mapif_party_optionchanged(int fd,struct party *p, int account_id, int flag);
//Updates party's level range and unsets even share if broken.
static int int_party_check_lv(struct party_data *p) {
- int i,lv;
+ int i;
+ unsigned int lv;
p->min_lv = UINT_MAX;
p->max_lv = 0;
for(i=0;i<MAX_PARTY;i++){
@@ -58,7 +59,8 @@ static int int_party_check_lv(struct party_data *p) {
//Calculates the state of a party.
static void int_party_calc_state(struct party_data *p)
{
- int i, lv;
+ int i;
+ unsigned int lv;
p->min_lv = UINT_MAX;
p->max_lv = 0;
p->party.count =
diff --git a/src/char/inter.c b/src/char/inter.c
index c3940765e..80d9f653a 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -36,7 +36,7 @@ struct accreg {
struct global_reg reg[ACCOUNT_REG_NUM];
};
-int party_share_level = 10;
+unsigned int party_share_level = 10;
int kick_on_disconnect = 1;
// 送信パケット長リスト
@@ -209,9 +209,7 @@ int inter_config_read(const char *cfgName) {
} else if (strcmpi(w1, "kick_on_disconnect") == 0) {
kick_on_disconnect = atoi(w2);
} else if (strcmpi(w1, "party_share_level") == 0) {
- party_share_level = atoi(w2);
- if (party_share_level < 0)
- party_share_level = 0;
+ party_share_level = (unsigned int)atof(w2);
} else if (strcmpi(w1, "inter_log_filename") == 0) {
strncpy(inter_log_filename, w2, sizeof(inter_log_filename));
} else if(strcmpi(w1,"log_inter")==0) {
diff --git a/src/char/inter.h b/src/char/inter.h
index ac8709cdc..b95d041dd 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -18,7 +18,7 @@ int inter_log(char *fmt,...);
#define inter_cfgName "conf/inter_athena.conf"
-extern int party_share_level;
+extern unsigned int party_share_level;
extern int kick_on_disconnect;
extern char inter_log_filename[1024];
extern int log_inter;