summaryrefslogtreecommitdiff
path: root/src/map/skill.h
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-03 12:58:52 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-03 12:58:52 +0000
commitb61a1f62f63da6ff26f8913bc58573e480ac436b (patch)
tree7c3d469e3c5ce864c33bfe79c74c1aeac310d6e4 /src/map/skill.h
parent87b8959a622f960225abea168894cb28a7a342de (diff)
downloadhercules-b61a1f62f63da6ff26f8913bc58573e480ac436b.tar.gz
hercules-b61a1f62f63da6ff26f8913bc58573e480ac436b.tar.bz2
hercules-b61a1f62f63da6ff26f8913bc58573e480ac436b.tar.xz
hercules-b61a1f62f63da6ff26f8913bc58573e480ac436b.zip
* Cleaned up parts of skill.c related to skill units
- removed some nonsense code in skill_dance_switch() (from r8876) - removed 'security system to prevent forgetting timer removal' (r1213) - renamed some skill-related data structs (had same name as variables) - commented out custom Venom Splasher countdown messaging code git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11347 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.h')
-rw-r--r--src/map/skill.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/skill.h b/src/map/skill.h
index 3f3420628..857c7a313 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -58,7 +58,7 @@
#define SD_ANIMATION 0x2000
// スキルデ?タベ?ス
-struct skill_db {
+struct s_skill_db {
char *name;
char *desc;
int range[MAX_SKILL_LEVEL],hit,inf,pl[MAX_SKILL_LEVEL],nk,splash[MAX_SKILL_LEVEL],max;
@@ -80,7 +80,7 @@ struct skill_db {
int unit_target;
int unit_flag;
};
-extern struct skill_db skill_db[MAX_SKILL_DB];
+extern struct s_skill_db skill_db[MAX_SKILL_DB];
struct skill_name_db {
int id; // skill id
@@ -91,7 +91,7 @@ struct skill_name_db {
#define MAX_SKILL_UNIT_LAYOUT 50
#define MAX_SQUARE_LAYOUT 5 // 11*11のユニット配置が最大
#define MAX_SKILL_UNIT_COUNT ((MAX_SQUARE_LAYOUT*2+1)*(MAX_SQUARE_LAYOUT*2+1))
-struct skill_unit_layout {
+struct s_skill_unit_layout {
int count;
int dx[MAX_SKILL_UNIT_COUNT];
int dy[MAX_SKILL_UNIT_COUNT];
@@ -112,27 +112,27 @@ enum {
};
// アイテム作成デ?タベ?ス
-struct skill_produce_db {
+struct s_skill_produce_db {
int nameid, trigger;
int req_skill,req_skill_lv,itemlv;
int mat_id[MAX_PRODUCE_RESOURCE],mat_amount[MAX_PRODUCE_RESOURCE];
};
-extern struct skill_produce_db skill_produce_db[MAX_SKILL_PRODUCE_DB];
+extern struct s_skill_produce_db skill_produce_db[MAX_SKILL_PRODUCE_DB];
// 矢作成デ?タベ?ス
-struct skill_arrow_db {
+struct s_skill_arrow_db {
int nameid, trigger;
int cre_id[5],cre_amount[5];
};
-extern struct skill_arrow_db skill_arrow_db[MAX_SKILL_ARROW_DB];
+extern struct s_skill_arrow_db skill_arrow_db[MAX_SKILL_ARROW_DB];
// アブラカダブラデ?タベ?ス
-struct skill_abra_db {
+struct s_skill_abra_db {
int nameid;
int req_lv;
int per;
};
-extern struct skill_abra_db skill_abra_db[MAX_SKILL_ABRA_DB];
+extern struct s_skill_abra_db skill_abra_db[MAX_SKILL_ABRA_DB];
extern int enchant_eff[5];
extern int deluge_eff[5];