Переглянути джерело

* [Fixed]
- Compilation warnings on guild.c and int_guild.c

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7088 54d463be-8e91-2dee-dedb-b68131a5f0ec

Lance 19 роки тому
батько
коміт
3b9eeb4451
4 змінених файлів з 5 додано та 3 видалено
  1. 2 0
      Changelog-Trunk.txt
  2. 1 1
      src/char/int_guild.c
  3. 1 1
      src/char_sql/int_guild.c
  4. 1 1
      src/map/guild.c

+ 2 - 0
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/06/09
+	* [Fixed]
+	  - Compilation warnings on guild.c and int_guild.c [Lance]
 	* Added structure party_data and party_member_data to the map server to
 	  hold party-specific required information about parties including
 	  Monk/TK/SG/SN states and party member count. Family information is still

+ 1 - 1
src/char/int_guild.c

@@ -1209,7 +1209,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int
 	{
 		unsigned int exp, old_exp=g->member[i].exp;
 		g->member[i].exp=*((unsigned int *)data);
-		if (g->member[i].exp > old_exp)
+		if (g->member[i].exp > (signed int)old_exp && old_exp < INT_MAX)
 		{
 			exp = g->member[i].exp - old_exp;
 			if (guild_exp_rate != 100)

+ 1 - 1
src/char_sql/int_guild.c

@@ -1527,7 +1527,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha
 	{	// EXP
 		unsigned int exp, old_exp=g->member[i].exp;
 		g->member[i].exp=*((unsigned int *)data);
-		if (g->member[i].exp > old_exp)
+		if (g->member[i].exp > (signed int)old_exp && old_exp < INT_MAX)
 		{
 			exp = g->member[i].exp - old_exp;
 			if (guild_exp_rate != 100)

+ 1 - 1
src/map/guild.c

@@ -367,7 +367,7 @@ int guild_payexp_timer_sub(DBKey dataid, void *data, va_list ap)
 		return 0;
 	}
 
-	if (g->member[i].exp > UINT_MAX - c->exp)
+	if ((long long)g->member[i].exp > (long long)(UINT_MAX - c->exp))
 		g->member[i].exp = UINT_MAX;
 	else
 		g->member[i].exp+= c->exp;