Bläddra i källkod

Merge pull request #515 from Heler/fix_warnings

Resolved compile warnings
Thanks to @Heler.
Aleos 10 år sedan
förälder
incheckning
4e2dcb47f3
3 ändrade filer med 3 tillägg och 4 borttagningar
  1. 1 1
      src/common/showmsg.c
  2. 0 1
      src/map/mob.c
  3. 2 2
      src/map/script.c

+ 1 - 1
src/common/showmsg.c

@@ -688,7 +688,7 @@ int _vShowMessage(enum msg_type flag, const char *string, va_list ap)
 		( ( flag == MSG_ERROR || flag == MSG_SQL ) && console_msg_log&2 ) ||
 		( flag == MSG_DEBUG && console_msg_log&4 ) ) {//[Ind]
 		FILE *log = NULL;
-		if( (log = fopen(console_log_filepath ? console_log_filepath : "./log/unknown.log","a+")) ) {
+		if( (log = fopen(console_log_filepath, "a+")) ) {
 			char timestring[255];
 			time_t curtime;
 			time(&curtime);

+ 0 - 1
src/map/mob.c

@@ -2849,7 +2849,6 @@ int mob_class_change (struct mob_data *md, int mob_id)
 {
 	unsigned int tick = gettick();
 	int i, c, hp_rate;
-	struct mob_db *mobdb = NULL;
 
 	nullpo_ret(md);
 

+ 2 - 2
src/map/script.c

@@ -11128,10 +11128,10 @@ BUILDIN_FUNC(getwaitingroomusers)
 	
 	if( nd != NULL && (cd=(struct chat_data *)map_id2bl(nd->chat_id)) != NULL ) {
 		for(i = 0; i < cd->users; ++i) {
-			setd_sub(st, NULL, ".@waitingroom_users", j, (void *)cd->usersd[i]->status.account_id, NULL);
+			setd_sub(st, NULL, ".@waitingroom_users", j, (void *)__64BPRTSIZE(cd->usersd[i]->status.account_id), NULL);
 			j++;
 		}
-		setd_sub(st, NULL, ".@waitingroom_usercount", 0, (void *)j, NULL);
+		setd_sub(st, NULL, ".@waitingroom_usercount", 0, (void *)__64BPRTSIZE(j), NULL);
 	}
 	return 0;
 }