Browse Source

Fixed some compile warnings

Fixed a shadowed variable in clif_parse_WisMessage
Adjusted a hardcoded limitation to use the correct define for event name length
Removed the check if the target is dead for killing cloud(leftover from 99e49d9)
Lemongrass3110 8 years ago
parent
commit
2cbc9ac507
3 changed files with 8 additions and 9 deletions
  1. 6 5
      src/map/clif.c
  2. 1 1
      src/map/npc.c
  3. 1 3
      src/map/status.c

+ 6 - 5
src/map/clif.c

@@ -10991,7 +10991,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
 		if ((npc = npc_name2id(str))) {
 			char split_data[NUM_WHISPER_VAR][CHAT_SIZE_MAX];
 			char *split;
-			char output[256];
+			char event[EVENT_NAME_LENGTH];
 
 			str = message;
 			// skip codepage indicator, if detected
@@ -11011,12 +11011,13 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
 			}
 
 			for( i = 0; i < NUM_WHISPER_VAR; ++i ) {
-				safesnprintf(output,sizeof(output),"@whispervar%d$", i);
-				set_var(sd,output,(char *) split_data[i]);
+				char variablename[CHAT_SIZE_MAX];
+				safesnprintf(variablename,sizeof(variablename),"@whispervar%d$", i);
+				set_var(sd,variablename,(char *) split_data[i]);
 			}
 
-			safesnprintf(output,sizeof(output),"%s::OnWhisperGlobal", npc->exname);
-			npc_event(sd,output,0); // Calls the NPC label
+			safesnprintf(event,sizeof(event),"%s::OnWhisperGlobal", npc->exname);
+			npc_event(sd,event,0); // Calls the NPC label
 
 			return;
 		}

+ 1 - 1
src/map/npc.c

@@ -822,7 +822,7 @@ int npc_event_sub(struct map_session_data* sd, struct event_data* ev, const char
 		ARR_FIND( 0, MAX_EVENTQUEUE, i, sd->eventqueue[i][0] == '\0' );
 		if( i < MAX_EVENTQUEUE )
 		{
-			safestrncpy(sd->eventqueue[i],eventname,50); //Event enqueued.
+			safestrncpy(sd->eventqueue[i],eventname,EVENT_NAME_LENGTH); //Event enqueued.
 			return 0;
 		}
 

+ 1 - 3
src/map/status.c

@@ -12517,9 +12517,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
 				map_freeblock_lock();
 				dounlock = true;
 				skill_attack(skill_get_type(status_sc2skill(type)), src, unit_bl, bl, SO_CLOUD_KILL, sce->val1, tick, 0);
-
-				if( !status_isdead(bl) )
-					sc_timer_next(500 + tick, status_change_timer, bl->id, data);
+				sc_timer_next(500 + tick, status_change_timer, bl->id, data);
 			}
 		}
 		break;