Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a crash caused by a mistake in r11657 (bad macro -> function code conversion)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11690 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-11-06 22:43:15 +00:00
parent 535df984a3
commit f47413c0fa
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/11/06
* Fixed a crash caused by a mistake in the previous change
2007/11/05
* Changed skill db loading code to work similarly to how itemdb/mobdb
is loaded (generic file loader + specialized function to process rows)

16
src/map/skill.c
View File

@ -91,15 +91,17 @@ const char* skill_get_desc( int id )
return skill_db[skill_get_index(id)].desc;
}
// macros to check for out of bounds errors [celest]
// out of bounds error checking [celest]
// i: Skill ID, l: Skill Level, var: Value to return after checking
// for values that don't require level just put a one (putting 0 will trigger return 0; instead
// for values that might need to use a different function just skill_chk would suffice.
#define skill_chk(i,l) \
if (skill_get_index(i) == 0) return 0; \
if (l <= 0 || l > MAX_SKILL_LEVEL) return 0;
#define skill_get(var,i,l) \
{ skill_chk((i), (l)); return (var); }
static void skill_chk(int* id, int lv)
{
*id = skill_get_index(*id); // checks/adjusts id
if( lv <= 0 || lv > MAX_SKILL_LEVEL ) *id = 0;
}
#define skill_get(var,id,lv) { skill_chk(&id,lv); if(!id) return 0; return var; }
// Skill DB
int skill_get_hit( int id ) { skill_get (skill_db[id].hit, id, 1); }
@ -108,7 +110,7 @@ int skill_get_ele( int id , int lv ) { skill_get (skill_db[id].element[lv-1
int skill_get_nk( int id ) { skill_get (skill_db[id].nk, id, 1); }
int skill_get_max( int id ) { skill_get (skill_db[id].max, id, 1); }
int skill_get_range( int id , int lv ) { skill_get (skill_db[id].range[lv-1], id, lv); }
int skill_get_splash( int id , int lv ) { skill_chk (id, lv); return (skill_db[id].splash[lv-1]>=0?skill_db[id].splash[lv-1]:AREA_SIZE); }
int skill_get_splash( int id , int lv ) { skill_chk (&id, lv); return (skill_db[id].splash[lv-1]>=0?skill_db[id].splash[lv-1]:AREA_SIZE); }
int skill_get_hp( int id ,int lv ) { skill_get (skill_db[id].hp[lv-1], id, lv); }
int skill_get_sp( int id ,int lv ) { skill_get (skill_db[id].sp[lv-1], id, lv); }
int skill_get_hp_rate(int id, int lv ) { skill_get (skill_db[id].hp_rate[lv-1], id, lv); }