summaryrefslogtreecommitdiff
path: root/src/map/skill.h
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-08 19:37:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-08 19:37:56 +0000
commitbdc2958ced13d80122b040ab357fd002d5c0e550 (patch)
treed133c73651e4ac575964c91496ebe13ea631fc0a /src/map/skill.h
parent7a308b07b92f9aa82b0e3d8dc987d69f3535b7e2 (diff)
downloadhercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.gz
hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.bz2
hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.xz
hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.zip
- Unified the rest and ganstar paradise code into a single function.
- Moved the Happy State trigger to the regen function, it now triggers at the same time the SPTIME does. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8681 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.h')
-rw-r--r--src/map/skill.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/skill.h b/src/map/skill.h
index c5d3fca58..d1d6cc011 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -226,8 +226,7 @@ int skill_guildaura_sub (struct block_list *bl,va_list ap);
// 詠唱キャンセル
int skill_castcancel(struct block_list *bl,int type);
-int skill_gangsterparadise(struct map_session_data *sd ,int type);
-int skill_rest(struct map_session_data *sd ,int type);
+int skill_sit (struct map_session_data *sd, int type);
void skill_brandishspear_first(struct square *tc,int dir,int x,int y);
void skill_brandishspear_dir(struct square *tc,int dir,int are);
void skill_repairweapon(struct map_session_data *sd, int idx);