diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-12 02:30:26 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-12 02:30:26 +0000 |
| commit | 5cf361411259af0c0afa5b4109ee2fda90d0a3bb (patch) | |
| tree | 265a4305326f932df258a13f290a2c4a5d68d997 | |
| parent | cfe7a018ed95f18c8523ed8ba66764800d21a146 (diff) | |
| download | hercules-5cf361411259af0c0afa5b4109ee2fda90d0a3bb.tar.gz hercules-5cf361411259af0c0afa5b4109ee2fda90d0a3bb.tar.bz2 hercules-5cf361411259af0c0afa5b4109ee2fda90d0a3bb.tar.xz hercules-5cf361411259af0c0afa5b4109ee2fda90d0a3bb.zip | |
- Oops, should have fixed the crash in intif gm message.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7626 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/login_sql/login.c | 1 | ||||
| -rw-r--r-- | src/map/intif.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index a964394bd..510131a43 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ 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/07/11
+ * Should have fixed the crash in intif gm message... [Skotlex]
* Fixed GTB card only working while you had a status-change active.
[Skotlex]
* Fixed being unable to compound cards in armor. [Skotlex]
diff --git a/src/login_sql/login.c b/src/login_sql/login.c index 4db7962a1..237ab2a0d 100644 --- a/src/login_sql/login.c +++ b/src/login_sql/login.c @@ -1514,7 +1514,6 @@ int parse_login(int fd) { sprintf(ip, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
memset(&account, 0, sizeof(account));
- i = RFIFOREST(fd)>=2?RFIFOW(fd,0):0;
if (session[fd]->eof) {
for(i = 0; i < MAX_SERVERS; i++)
diff --git a/src/map/intif.c b/src/map/intif.c index 35fe41d99..9f20d3a9c 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -837,10 +837,10 @@ static int mapif_parse_WisToGM_sub(struct map_session_data* sd,va_list va) { char *message;
int len;
if (pc_isGM(sd) < min_gm_level) return 0;
- clif_wis_message(sd->fd, wisp_name, message, len);
wisp_name = va_arg(va, char*);
message = va_arg(va, char*);
len = va_arg(va, int);
+ clif_wis_message(sd->fd, wisp_name, message, len);
return 1;
}
|