diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-19 12:55:29 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-19 12:55:29 +0000 |
| commit | 3c89751e48a424ce26bc1c6f78f4bf7fb6242fac (patch) | |
| tree | 3c8b08a06bfe053c32d6312092576db372fc757e /src/map/pet.c | |
| parent | 2a2455a8ac012ef30c85c07d0ad5dd39307acae4 (diff) | |
| download | hercules-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/pet.c')
| -rw-r--r-- | src/map/pet.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index d9743332a..ebfbc6a0e 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -1,10 +1,6 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - #include "../common/db.h" #include "../common/timer.h" #include "../common/nullpo.h" @@ -28,6 +24,11 @@ #include "unit.h" #include "atcommand.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + + #define MIN_PETTHINKTIME 100 struct pet_db pet_db[MAX_PET_DB]; @@ -555,7 +556,7 @@ int pet_catch_process2(struct map_session_data* sd, int target_id) return 1; } - //FIXME: delete taming item here, if this was an item-invoked capture and the item was flagged as delay-consume + //FIXME: delete taming item here, if this was an item-invoked capture and the item was flagged as delay-consume [ultramage] i = search_petDB_index(md->class_,PET_CLASS); //catch_target_class == 0 is used for universal lures (except bosses for now). [Skotlex] |