summaryrefslogtreecommitdiff
path: root/src/map/skill.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/skill.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/skill.c')
-rw-r--r--src/map/skill.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 668020026..b8abc15c8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1,11 +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 <time.h>
-
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
@@ -33,6 +28,12 @@
#include "date.h"
#include "unit.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+
#define SKILLUNITTIMER_INVERVAL 100
//Guild Skills are shifted to these to make them stick into the skill array.
#define GD_SKILLRANGEMIN 900
@@ -8006,7 +8007,7 @@ static int skill_check_condition_mob_master_sub (struct block_list *bl, va_list
* Determines if a given skill should be made to consume ammo
* when used by the player. [Skotlex]
*------------------------------------------*/
-int skill_isammotype (TBL_PC *sd, int skill)
+int skill_isammotype (struct map_session_data *sd, int skill)
{
return (
battle_config.arrow_decrement==2 &&