diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-03 14:15:20 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-03 14:15:20 +0000 |
| commit | 2e6efcc4c718d89bf832cd10b5261add097c8bf6 (patch) | |
| tree | aa070e029f64fc8fb9b1e2ff2c3d31702dafe816 /src/map | |
| parent | 6395ddae721ba873428d1a82f167aa4ed49ac0b5 (diff) | |
| download | hercules-2e6efcc4c718d89bf832cd10b5261add097c8bf6.tar.gz hercules-2e6efcc4c718d89bf832cd10b5261add097c8bf6.tar.bz2 hercules-2e6efcc4c718d89bf832cd10b5261add097c8bf6.tar.xz hercules-2e6efcc4c718d89bf832cd10b5261add097c8bf6.zip | |
- Corrected @whomap directly invoking msg_table[] rather than msg_txt()
- Guessed where the pet data goes in spawn packet 0x7c
- Updated Charge Attack's state from none to move_enable.
- Made tomahawk an NPC_SKILL so that it may not be plagiarized.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6459 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 6 | ||||
| -rw-r--r-- | src/map/clif.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index d15b04937..92b27e103 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1835,11 +1835,11 @@ int atcommand_whomap( }
if (count == 0)
- sprintf(atcmd_output, msg_table[54], map[map_id].name); // No player found in map '%s'.
+ sprintf(atcmd_output, msg_txt(54), map[map_id].name); // No player found in map '%s'.
else if (count == 1)
- sprintf(atcmd_output, msg_table[55], map[map_id].name); // 1 player found in map '%s'.
+ sprintf(atcmd_output, msg_txt(55), map[map_id].name); // 1 player found in map '%s'.
else {
- sprintf(atcmd_output, msg_table[56], count, map[map_id].name); // %d players found in map '%s'.
+ sprintf(atcmd_output, msg_txt(56), count, map[map_id].name); // %d players found in map '%s'.
}
clif_displaymessage(fd, atcmd_output);
diff --git a/src/map/clif.c b/src/map/clif.c index 51f8c5bb2..fb2157989 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1334,13 +1334,19 @@ int clif_spawn(struct block_list *bl) } else { //Mob spawn packet.
struct status_change *sc = status_get_sc(bl);
+ memset(buf,0,sizeof(buf));
WBUFW(buf,0)=0x7c;
WBUFL(buf,2)=bl->id;
WBUFW(buf,6)=status_get_speed(bl);
- WBUFW(buf,8)=sc?sc->opt1:0;
- WBUFW(buf,10)=sc?sc->opt2:0;
- WBUFW(buf,12)=sc?sc->option:0;
+ if (sc) {
+ WBUFW(buf,8)=sc->opt1;
+ WBUFW(buf,10)=sc->opt2;
+ WBUFW(buf,12)=sc->option;
+ }
WBUFW(buf,20)=vd->class_;
+ WBUFW(buf,22)=vd->hair_style; //Required for pets.
+ WBUFW(buf,24)=vd->head_bottom; //Pet armor
+
WBUFPOS(buf,36,bl->x,bl->y);
clif_send(buf,packet_len_table[0x7c],bl,AREA_WOS);
if (disguised(bl)) {
|