diff options
| author | Haruna <haru@dotalux.com> | 2013-12-16 19:25:58 -0800 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2013-12-16 19:25:58 -0800 |
| commit | 8b84026c292fed6f6218278c870c4f8839fbd40a (patch) | |
| tree | 4b62aa52844a1916db1f18faba8b9cf29ff30810 /src/map/guild.c | |
| parent | 9e223137eba56dcd41bececf4360f321c9117247 (diff) | |
| parent | 3917562fc493c031bb20181b5d9ae6ab15ce9b76 (diff) | |
| download | hercules-8b84026c292fed6f6218278c870c4f8839fbd40a.tar.gz hercules-8b84026c292fed6f6218278c870c4f8839fbd40a.tar.bz2 hercules-8b84026c292fed6f6218278c870c4f8839fbd40a.tar.xz hercules-8b84026c292fed6f6218278c870c4f8839fbd40a.zip | |
Merge pull request #237 from HerculesWS/warnings
This adds an Xcode project file (for those who develop on OS X) and fixes several - potential or real - issues we detected thanks to its more strict warnings settings. It also updates the unix build script with similar warning settings.
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 66376a2a8..8a34b7f4b 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1594,10 +1594,10 @@ int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd) * Notification of a relationship between 2 guilds *---------------------------------------------------*/ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id2,int flag,const char *name1,const char *name2) { - struct guild *g[2]; - int guild_id[2]; - const char *guild_name[2]; - struct map_session_data *sd[2]; + struct guild *g[2] = { NULL }; + int guild_id[2] = { 0 }; + const char *guild_name[2] = { NULL }; + struct map_session_data *sd[2] = { NULL }; int j,i; guild_id[0] = guild_id1; @@ -1664,11 +1664,11 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id for (i = 0; i < 2 - (flag & 1); i++) { // Retransmission of the relationship list to all members - struct map_session_data *sd; + struct map_session_data *msd; if(g[i]!=NULL) for(j=0;j<g[i]->max_member;j++) - if((sd=g[i]->member[j].sd)!=NULL) - clif->guild_allianceinfo(sd); + if((msd=g[i]->member[j].sd)!=NULL) + clif->guild_allianceinfo(msd); } return 0; } |