summaryrefslogtreecommitdiff
path: root/src/char_sql
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-29 08:19:07 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-29 08:19:07 +0000
commite7bae02e70b98330adbf1a44ace9a9939636cd50 (patch)
tree4081aac30fe79be4d8364435dc31439e7b2c8ff5 /src/char_sql
parentb91483219d36a4fb7359a5fdc17cedaf73b18dc5 (diff)
downloadhercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.gz
hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.bz2
hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.xz
hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.zip
Renamed struct 'skill' to 's_skill' to remove naming collisions.
Added defines for mercenary skill ranges. Added a mapping of mercenary skills to the skill db (700-799 atm). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13012 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql')
-rw-r--r--src/char_sql/char.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index f11fb7896..e03062197 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -886,7 +886,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
char point_map[MAP_NAME_LENGTH_EXT];
struct point tmp_point;
struct item tmp_item;
- struct skill tmp_skill;
+ struct s_skill tmp_skill;
struct s_friend tmp_friend;
#ifdef HOTKEY_SAVING
struct hotkey tmp_hotkey;