Expanded range for cached and stored-in-db guild member exp (devotion) from uint32 to uint64. (bugreport:3983)

Capped value when sending to client to INT_MAX to prevent confusion.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14242 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 9 insertions, 9 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index f9fd3ffca..db6d4a291 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6616,7 +6616,7 @@ int clif_guild_memberlist(struct map_session_data *sd)
 		WFIFOW(fd,c*104+16)=m->gender;
 		WFIFOW(fd,c*104+18)=m->class_;
 		WFIFOW(fd,c*104+20)=m->lv;
-		WFIFOL(fd,c*104+22)=m->exp;
+		WFIFOL(fd,c*104+22)=cap_value(m->exp,0,INT_MAX);
 		WFIFOL(fd,c*104+26)=m->online;
 		WFIFOL(fd,c*104+30)=m->position;
 		memset(WFIFOP(fd,c*104+34),0,50);	// メモ？
diff --git a/src/map/guild.c b/src/map/guild.c
index e7b9f4096..8cb263a87 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -48,7 +48,7 @@ struct eventlist {
 // ギルドのEXPキャッシュ
 struct guild_expcache {
 	int guild_id, account_id, char_id;
-	unsigned int exp;
+	uint64 exp;
 };
 static struct eri *expcache_ers; //For handling of guild exp payment.
 
@@ -343,8 +343,8 @@ int guild_payexp_timer_sub(DBKey dataid, void *data, va_list ap)
 		return 0;
 	}
 
-	if (g->member[i].exp > UINT_MAX - c->exp)
-		g->member[i].exp = UINT_MAX;
+	if (g->member[i].exp > UINT64_MAX - c->exp)
+		g->member[i].exp = UINT64_MAX;
 	else
 		g->member[i].exp+= c->exp;
 
@@ -1193,13 +1193,13 @@ unsigned int guild_payexp(struct map_session_data *sd,unsigned int exp)
 	
 
 	if (per < 100)
-		exp = (unsigned int) exp * per / 100;
+		exp = exp * per / 100;
 	//Otherwise tax everything.
 	
 	c = (struct guild_expcache*)guild_expcache_db->ensure(guild_expcache_db, i2key(sd->status.char_id), create_expcache, sd);
 
-	if (c->exp > UINT_MAX - exp)
-		c->exp = UINT_MAX;
+	if (c->exp > UINT64_MAX - exp)
+		c->exp = UINT64_MAX;
 	else
 		c->exp += exp;
 	
@@ -1217,8 +1217,8 @@ int guild_getexp(struct map_session_data *sd,int exp)
 		return 0;
 
 	c = (struct guild_expcache*)guild_expcache_db->ensure(guild_expcache_db, i2key(sd->status.char_id), create_expcache, sd);
-	if (c->exp > UINT_MAX - exp)
-		c->exp = UINT_MAX;
+	if (c->exp > UINT64_MAX - exp)
+		c->exp = UINT64_MAX;
 	else
 		c->exp += exp;
 	return exp;