summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-19 12:55:29 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-19 12:55:29 +0000
commit3c89751e48a424ce26bc1c6f78f4bf7fb6242fac (patch)
tree3c8b08a06bfe053c32d6312092576db372fc757e /src/map/npc.c
parent2a2455a8ac012ef30c85c07d0ad5dd39307acae4 (diff)
downloadhercules-3c89751e48a424ce26bc1c6f78f4bf7fb6242fac.tar.gz
hercules-3c89751e48a424ce26bc1c6f78f4bf7fb6242fac.tar.bz2
hercules-3c89751e48a424ce26bc1c6f78f4bf7fb6242fac.tar.xz
hercules-3c89751e48a424ce26bc1c6f78f4bf7fb6242fac.zip
* Cleaned/clarified some #include relationships between headers
* Changed clif_sitting() to use 'bl' instead of 'sd' (for non-player objects) * Removed way messed-up script function 'unitdeadsit' * Tagged 'FIXME' lines written by myself git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11040 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 352161189..40df4b678 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -31,7 +31,6 @@
#include <time.h>
-
// linked list of npc source files
struct npc_src_list {
struct npc_src_list* next;
@@ -1102,7 +1101,7 @@ int npc_checknear2(struct map_session_data* sd, struct block_list* bl)
return 0;
}
-TBL_NPC* npc_checknear(struct map_session_data* sd, struct block_list* bl)
+struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl)
{
struct npc_data *nd;
@@ -2808,7 +2807,7 @@ void npc_parsesrcfile(const char* name)
return;
}
-int npc_script_event(TBL_PC* sd, int type)
+int npc_script_event(struct map_session_data* sd, int type)
{
int i;
if (type < 0 || type >= NPCE_MAX)