From e7bae02e70b98330adbf1a44ace9a9939636cd50 Mon Sep 17 00:00:00 2001 From: ultramage Date: Tue, 29 Jul 2008 08:19:07 +0000 Subject: 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 --- src/char_sql/char.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/char_sql') 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; -- cgit v1.2.3-70-g09d2