- Now @whogm hides perfect-hide gms only if their GM level is greater than the one who invoked the command.

- Some minor cleanups.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10290 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 5 insertions, 10 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index b6fe0e20c..a0827fcf6 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1818,8 +1818,6 @@ int atcommand_whogm(const int fd, struct map_session_data* sd, const char* comma
 		pl_GM_level = pc_isGM(pl_sd);
 		if (!pl_GM_level)
 			continue;
-		if (pl_sd->sc.option & OPTION_INVISIBLE)
-			continue;
 
 		if (match_text[0])
 		{
@@ -1831,6 +1829,8 @@ int atcommand_whogm(const int fd, struct map_session_data* sd, const char* comma
 				continue;
 		}
 		if (pl_GM_level > GM_level) {
+			if (pl_sd->sc.option & OPTION_INVISIBLE)
+				continue;
 			sprintf(atcmd_output, "Name: %s (GM)", pl_sd->status.name);
 			clif_displaymessage(fd, atcmd_output);
 			count++;
diff --git a/src/map/map.c b/src/map/map.c
index 169d038af..0975c1a37 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -276,16 +276,13 @@ int map_freeblock_lock (void)
  * バッファにたまっていたblockを全部削除
  *------------------------------------------
  */
-//int map_freeblock_unlock (void)
-int map_freeblock_unlock_sub(char *file, int lineno)
+int map_freeblock_unlock (void)
 {
 	if ((--block_free_lock) == 0) {
 		int i;
 		for (i = 0; i < block_free_count; i++)
 		{
 			aFree(block_free[i]);
-//			_mfree(block_free[i], file, lineno, __func__);
-//			_mfree(block_free[i], file, ((block_free[i]?block_free[i]->type:0)*100000)+lineno, __func__);
 			block_free[i] = NULL;
 		}
 		block_free_count = 0;
diff --git a/src/map/map.h b/src/map/map.h
index 00f95356a..0600729c3 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1290,9 +1290,7 @@ int map_getusers(void);
 // block削除関連
 int map_freeblock(struct block_list *bl);
 int map_freeblock_lock(void);
-//int map_freeblock_unlock(void);
-int map_freeblock_unlock_sub (char *file, int lineno);
-#define map_freeblock_unlock() map_freeblock_unlock_sub (__FILE__, __LINE__)
+int map_freeblock_unlock(void);
 // block関連
 int map_addblock_sub(struct block_list *, int);
 int map_delblock_sub(struct block_list *, int);
diff --git a/src/map/skill.c b/src/map/skill.c
index 385ef35f9..34c07dd51 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5707,7 +5707,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data)
 			else if(inf2&INF2_NO_ENEMY)
 				inf = BCT_NOENEMY;
 			else
-				inf =0;
+				inf = 0;
 
 			if(inf2 & (INF2_PARTY_ONLY|INF2_GUILD_ONLY) && src != target)
 			{