summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-02-09 20:26:42 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-02-09 20:26:42 +0000
commit0034a439b74142f27a93b422ef66eaa90ddb7ab3 (patch)
tree560d2c8f405398602ab425d3c97ab3acd3c96d65 /src/char
parent321fad2e5e3ceff3f624d124565b22ca9868db9f (diff)
downloadhercules-0034a439b74142f27a93b422ef66eaa90ddb7ab3.tar.gz
hercules-0034a439b74142f27a93b422ef66eaa90ddb7ab3.tar.bz2
hercules-0034a439b74142f27a93b422ef66eaa90ddb7ab3.tar.xz
hercules-0034a439b74142f27a93b422ef66eaa90ddb7ab3.zip
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
Diffstat (limited to 'src/char')
-rw-r--r--src/char/int_guild.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index dac684391..e9b77f184 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -49,7 +49,7 @@ int inter_guild_tostr(char* str, struct guild* g)
for(i = 0; i < g->max_member; i++)
{
struct guild_member *m = &g->member[i];
- len += sprintf(str + len, "%d,%d,%d,%d,%d,%d,%d,%u,%d,%d\t%s\t",
+ len += sprintf(str + len, "%d,%d,%d,%d,%d,%d,%d,%llu,%d,%d\t%s\t",
m->account_id, m->char_id,
m->hair, m->hair_color, m->gender,
m->class_, m->lv, m->exp, m->exp_payper, m->position,
@@ -150,7 +150,7 @@ int inter_guild_fromstr(char* str, struct guild* g)
int charid;
int hair, hair_color, gender;
int class_, lv;
- unsigned int exp;
+ uint64 exp;
int exp_payper;
int position;
char name[256]; // only 24 used
@@ -160,7 +160,7 @@ int inter_guild_fromstr(char* str, struct guild* g)
for( i = 0; i < g->max_member; i++ )
{
struct guild_member* m = &g->member[i];
- if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%u,%d,%d\t%[^\t]\t%n",
+ if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%llu,%d,%d\t%[^\t]\t%n",
&accountid, &charid, &hair, &hair_color, &gender,
&class_, &lv, &exp, &exp_payper, &position,
name, &len) < 11)