summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/chrif.c10
-rw-r--r--src/map/mob.c3
3 files changed, 7 insertions, 9 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2ee4047d9..cfbc68a38 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/24
+ * All GMs will be sent to the char server through packet 0x2aff now.
+ (previously hidden gms were not sent to the char-server as online) [Skotlex]
+ * Made mob_searchname compare versus sprite, name and jname now. [Skotlex]
* Added script command escape_sql. It will return an escaped string for use
in the sql_query script command (in case you want to use input of players
in your queries). [Skotlex]
diff --git a/src/map/chrif.c b/src/map/chrif.c
index ce0d0b19b..373808cc7 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -1493,13 +1493,9 @@ int send_users_tochar(int tid, unsigned int tick, int id, int data) {
WFIFOHEAD(char_fd, 6+8*users);
WFIFOW(char_fd,0) = 0x2aff;
for (i = 0; i < count; i++) {
- if (all_sd[i] &&
- !((battle_config.hide_GM_session || (all_sd[i]->sc.option & OPTION_INVISIBLE)) && pc_isGM(all_sd[i])))
- {
- WFIFOL(char_fd,6+8*users) = all_sd[i]->status.account_id;
- WFIFOL(char_fd,6+8*users+4) = all_sd[i]->status.char_id;
- users++;
- }
+ WFIFOL(char_fd,6+8*users) = all_sd[i]->status.account_id;
+ WFIFOL(char_fd,6+8*users+4) = all_sd[i]->status.char_id;
+ users++;
}
WFIFOW(char_fd,2) = 6 + 8 * users;
WFIFOW(char_fd,4) = users;
diff --git a/src/map/mob.c b/src/map/mob.c
index 5e960b4fa..bdd6d6bb4 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -74,8 +74,7 @@ int mobdb_searchname(const char *str)
mob = mob_db(i);
if(mob == mob_dummy) //Skip dummy mobs.
continue;
- if(strcmpi(mob->name,str)==0 || strcmpi(mob->jname,str)==0 ||
- memcmp(mob->name,str,NAME_LENGTH)==0 || memcmp(mob->jname,str,NAME_LENGTH)==0)
+ if(strcmpi(mob->name,str)==0 || strcmpi(mob->jname,str)==0 || strcmpi(mob->sprite,str)==0)
return i;
}