summaryrefslogtreecommitdiff
path: root/src/map/skill.h
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-31 13:20:48 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-31 13:20:48 +0000
commit5792a98ec3a549d28037c65465db8c64e009823d (patch)
tree43ac7806ce57d4e678cd995d2a1828f5d44978c5 /src/map/skill.h
parent6e103602b6e23f86fd89f9c48a0846b4243f2c5f (diff)
downloadhercules-5792a98ec3a549d28037c65465db8c64e009823d.tar.gz
hercules-5792a98ec3a549d28037c65465db8c64e009823d.tar.bz2
hercules-5792a98ec3a549d28037c65465db8c64e009823d.tar.xz
hercules-5792a98ec3a549d28037c65465db8c64e009823d.zip
* Added names to the SC_ and SI_ enums, now they can be used to properly indicate where such values are to be used (replaces usage of 'int')
* removed MIN_/MAX_PORTAL_MEMO, set MAX_MEMOPOINTS from 10 to 3 * removed support for @go-ing to your memo points * simplified the overly verbose @memo command; now re-uses pc_memo() * cleaned up pc_memo(), now uses semi-correct packet replies * Minor code cleaning/formatting git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11625 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.h')
-rw-r--r--src/map/skill.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/skill.h b/src/map/skill.h
index 7d0580945..efb6cd086 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -4,9 +4,10 @@
#ifndef _SKILL_H_
#define _SKILL_H_
+#include "../common/mmo.h" // MAX_SKILL
#include "map.h" // MAX_SKILL_LEVEL, ...
-#define MAX_SKILL_DB 1100
+#define MAX_SKILL_DB MAX_SKILL
#define MAX_SKILL_PRODUCE_DB 150
#define MAX_PRODUCE_RESOURCE 12
#define MAX_SKILL_ARROW_DB 150
@@ -86,7 +87,7 @@ extern struct s_skill_db skill_db[MAX_SKILL_DB];
struct skill_name_db {
int id; // skill id
char *name; // search strings
- char *desc; // description that shows up for search's
+ char *desc; // description that shows up for searches
};
#define MAX_SKILL_UNIT_LAYOUT 50
@@ -255,8 +256,7 @@ int skill_chastle_mob_changetarget(struct block_list *bl,va_list ap); //[orn]
// アイテム作成
int skill_can_produce_mix( struct map_session_data *sd, int nameid, int trigger, int qty);
-int skill_produce_mix( struct map_session_data *sd,
- int skill_id, int nameid, int slot1, int slot2, int slot3, int qty );
+int skill_produce_mix( struct map_session_data *sd, int skill_id, int nameid, int slot1, int slot2, int slot3, int qty );
int skill_arrow_create( struct map_session_data *sd,int nameid);