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

Fixed @npcmove

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@435 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
celest 2004-12-02 17:26:25 +00:00
parent 63a02c3d43
commit 90e4b14002
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -5,6 +5,7 @@ Date Added
- Updated Berserk, Chase Walk, Slim Pitcher - Updated Berserk, Chase Walk, Slim Pitcher
- Added skill_range_leniency - Added skill_range_leniency
* Added check for clif.c in case the server didn't realise we've died [celest] * Added check for clif.c in case the server didn't realise we've died [celest]
* Added a fix for @npcmove by JohnC and Fredzilla
12/1 12/1
- Make it build against gcc 2.95 [MouseJstr] - Make it build against gcc 2.95 [MouseJstr]

21
src/map/atcommand.c
View File

@ -6896,27 +6896,26 @@ atcommand_npcmove(const int fd, struct map_session_data* sd,
int x = 0, y = 0; int x = 0, y = 0;
struct npc_data *nd = 0; struct npc_data *nd = 0;
if( sd == NULL ) nullpo_retr(-1, sd);
return -1;
if (!message || !*message) if (!message || !*message)
return -1; return -1;
memset(character, '\0', sizeof character); memset(character, '\0', sizeof character);
if (sscanf(message, "%d %d %99[^\n]", &x, &y, character) < 4) if (sscanf(message, "%d %d %99[^\n]", &x, &y, character) < 3) {
clif_displaymessage(fd, "Usage: @npcmove <X> <Y> <npc_name>");
return -1; return -1;
}
nd=npc_name2id(character); nullpo_retr(-1, (nd = npc_name2id(character)));
if (nd==NULL)
return -1;
npc_enable(character, 0); npc_enable(character, 0);
nd->bl.x = x; nd->bl.x = x;
nd->bl.y = y; nd->bl.y = y;
npc_enable(character, 1); npc_enable(character, 1);
return 0; return 0;
} }
/*========================================== /*==========================================