From e98da76049ed45fce2490b48e9d6418bd1ec1223 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 3 Mar 2006 20:01:00 +0000 Subject: - Fixed compilation error on windows - Strip sc's are now removed on logout. - Some cleanups git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5451 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index 376f15c6d..630d513d8 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9440,13 +9440,10 @@ void clif_parse_Wis(int fd, struct map_session_data *sd) { // S 0096 .w sc.count && (sd->sc.data[SC_BERSERK].timer!=-1 || sd->sc.data[SC_NOCHAT].timer != -1)) - { - if(gm_command) aFree(gm_command); return; - } - if(gm_command) aFree(gm_command); //Chat Logging type 'W' / Whisper if(log_config.chat&1 //we log everything then @@ -9459,7 +9456,7 @@ void clif_parse_Wis(int fd, struct map_session_data *sd) { // S 0096 .w 4)) { - whisper_tmp = (char*) RFIFOP(fd,4) + 4; + whisper_tmp = (char*) RFIFOP(fd,4) + 4; if ((npc = npc_name2id(whisper_tmp))) { whisper_tmp=(char *)aCallocA(strlen((char *)(RFIFOP(fd,28))+1),sizeof(char)); @@ -9497,10 +9494,9 @@ if ((strncasecmp((const char*)RFIFOP(fd,4),"NPC:",4) == 0) && (strlen((const cha sprintf(whisper_tmp, "%s::OnWhisperGlobal", npc->name); npc_event(sd,whisper_tmp,0); // Calls the NPC label - return; aFree(whisper_tmp); //I rewrote it a little to use memory allocation, a bit more stable =P [Kevin] - whisper_tmp = NULL; + return; } //should have just removed the one below that was a my bad =P } -- cgit v1.2.3-70-g09d2