From 347246d6719e12e426f5681085493dc0227345ed Mon Sep 17 00:00:00 2001 From: Eugenio Favalli Date: Sun, 22 May 2005 13:17:30 +0000 Subject: This way auto attack should work with left ctrl too (also some docs updates) --- src/net/protocol.cpp | 29 ++++++++++++++--------------- src/net/protocol.h | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) (limited to 'src/net') diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp index 7dc83cfa..4b94a66c 100644 --- a/src/net/protocol.cpp +++ b/src/net/protocol.cpp @@ -224,29 +224,28 @@ void action(char type, int id) WFIFOSET(7); } -void attack(unsigned short x, unsigned short y, unsigned char direction) +int attack(unsigned short x, unsigned short y, unsigned char direction) { - int monster_id = 0; + Being *target; if (direction == SOUTH) { - monster_id = findMonster(x, y + 1); - if (monster_id != 0) - action(0, monster_id); + target = findNode(x, y + 1); } else if(direction == WEST) { - monster_id = findMonster(x - 1, y); - if (monster_id != 0) - action(0, monster_id); + target = findNode(x - 1, y); } else if(direction == NORTH) { - monster_id = findMonster(x, y - 1); - if (monster_id != 0) - action(0, monster_id); + target = findNode(x, y - 1); } else if(direction==EAST) { - monster_id = findMonster(x + 1, y); - if (monster_id != 0) - action(0, monster_id); + target = findNode(x + 1, y); } - // implement charging attacks here + if (target && target->isMonster()) { + attack(target); + return target->id; + } + + // Implement charging attacks here char_info->lastAttackTime = 0; + + return 0; } void attack(Being *target) { diff --git a/src/net/protocol.h b/src/net/protocol.h index dd6b36e2..07684298 100644 --- a/src/net/protocol.h +++ b/src/net/protocol.h @@ -81,7 +81,7 @@ void walk(unsigned short x, unsigned short y, unsigned char direction); void speak(char *speech); /** Request to attack */ -void attack(unsigned short x, unsigned short y, unsigned char direction); +int attack(unsigned short x, unsigned short y, unsigned char direction); /** Request to attack */ void attack(Being *target); -- cgit v1.2.3-70-g09d2