Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- Some minor cleanups.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10290 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-04-18 20:28:33 +00:00
parent 399d55f6f7
commit 2eeaa8f27a
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/atcommand.c
View File

@ -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); pl_GM_level = pc_isGM(pl_sd);
if (!pl_GM_level) if (!pl_GM_level)
continue; continue;
if (pl_sd->sc.option & OPTION_INVISIBLE)
continue;
if (match_text[0]) if (match_text[0])
{ {
@ -1831,6 +1829,8 @@ int atcommand_whogm(const int fd, struct map_session_data* sd, const char* comma
continue; continue;
} }
if (pl_GM_level > GM_level) { if (pl_GM_level > GM_level) {
if (pl_sd->sc.option & OPTION_INVISIBLE)
continue;
sprintf(atcmd_output, "Name: %s (GM)", pl_sd->status.name); sprintf(atcmd_output, "Name: %s (GM)", pl_sd->status.name);
clif_displaymessage(fd, atcmd_output); clif_displaymessage(fd, atcmd_output);
count++; count++;

5
src/map/map.c
View File

@ -276,16 +276,13 @@ int map_freeblock_lock (void)
* バッファにたまっていたblockを全部削除 * バッファにたまっていたblockを全部削除
*------------------------------------------ *------------------------------------------
*/ */
//int map_freeblock_unlock (void) int map_freeblock_unlock (void)
int map_freeblock_unlock_sub(char *file, int lineno)
{ {
if ((--block_free_lock) == 0) { if ((--block_free_lock) == 0) {
int i; int i;
for (i = 0; i < block_free_count; i++) for (i = 0; i < block_free_count; i++)
{ {
aFree(block_free[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[i] = NULL;
} }
block_free_count = 0; block_free_count = 0;

4
src/map/map.h
View File

@ -1290,9 +1290,7 @@ int map_getusers(void);
// block<63>í<EFBFBD>œŠÖ˜A // block<63>í<EFBFBD>œŠÖ˜A
int map_freeblock(struct block_list *bl); int map_freeblock(struct block_list *bl);
int map_freeblock_lock(void); int map_freeblock_lock(void);
//int map_freeblock_unlock(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__)
// blockŠÖ˜A // blockŠÖ˜A
int map_addblock_sub(struct block_list *, int); int map_addblock_sub(struct block_list *, int);
int map_delblock_sub(struct block_list *, int); int map_delblock_sub(struct block_list *, int);

2
src/map/skill.c
View File

@ -5707,7 +5707,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data)
else if(inf2&INF2_NO_ENEMY) else if(inf2&INF2_NO_ENEMY)
inf = BCT_NOENEMY; inf = BCT_NOENEMY;
else else
inf =0; inf = 0;
if(inf2 & (INF2_PARTY_ONLY|INF2_GUILD_ONLY) && src != target) if(inf2 & (INF2_PARTY_ONLY|INF2_GUILD_ONLY) && src != target)
{ {