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

Follow up r16842. added some missed added lines of code..

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16843 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
rud0lp20 2012-10-30 07:57:37 +00:00
parent 156446bf33
commit 2d68f350c2
1 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/map/pc.c
View File

@ -2020,7 +2020,7 @@ int pc_bonus_subele(struct map_session_data* sd, unsigned char ele, short rate,
}
/*==========================================
* ? <EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>ɂ<EFBFBD><EFBFBD>\<EFBFBD>͓<EFBFBD><EFBFBD>̃{?<EFBFBD>i<EFBFBD>X<EFBFBD>ݒ<EFBFBD>
* ? ???i????\????~{??i?X???
*------------------------------------------*/
int pc_bonus(struct map_session_data *sd,int type,int val)
{
@ -2618,7 +2618,7 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
}
/*==========================================
* ? <EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>ɂ<EFBFBD><EFBFBD>\<EFBFBD>͓<EFBFBD><EFBFBD>̃{?<EFBFBD>i<EFBFBD>X<EFBFBD>ݒ<EFBFBD>
* ? ???i????\????~{??i?X???
*------------------------------------------*/
int pc_bonus2(struct map_session_data *sd,int type,int type2,int val)
{
@ -4861,13 +4861,13 @@ int pc_checkskill(struct map_session_data *sd,int skill_id)
}
/*==========================================
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>?<EFBFBD>X<EFBFBD>ɂ<EFBFBD><EFBFBD>X<EFBFBD>L<EFBFBD><EFBFBD><EFBFBD><EFBFBD>??<EFBFBD>`<EFBFBD>F<EFBFBD>b<EFBFBD>N
* <EFBFBD><EFBFBD>?<EFBFBD>F
* struct map_session_data *sd <EFBFBD>Z<EFBFBD>b<EFBFBD>V<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>f?<EFBFBD>^
* int nameid ?<EFBFBD><EFBFBD><EFBFBD>iID
* <EFBFBD>Ԃ<EFBFBD>l<EFBFBD>F
* 0 ?<EFBFBD>X<EFBFBD>Ȃ<EFBFBD>
* -1 <EFBFBD>X<EFBFBD>L<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* ??????X????X?L???????`?F?b?N
* ????F
* struct map_session_data *sd ?Z?b?V?????f??^
* int nameid ????iID
* ???l?F
* 0 ??X???
* -1 ?X?L????????
*------------------------------------------*/
int pc_checkallowskill(struct map_session_data *sd)
{
@ -7492,7 +7492,7 @@ int pc_setcart(struct map_session_data *sd,int type) {
int pc_setfalcon(TBL_PC* sd, int flag)
{
if( flag ){
if( pc_checkskill(sd,HT_FALCON)>0 ) // <EFBFBD>t<EFBFBD>@<40><><EFBFBD>R<EFBFBD><52><EFBFBD>}<7D>X<EFBFBD>^<5E><>?<3F>X<EFBFBD>L<EFBFBD><4C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if( pc_checkskill(sd,HT_FALCON)>0 ) // ?t?@???R???}?X?^????X?L??????
pc_setoption(sd,sd->sc.option|OPTION_FALCON);
} else if( pc_isfalcon(sd) ){
pc_setoption(sd,sd->sc.option&~OPTION_FALCON); // remove falcon
@ -7507,7 +7507,7 @@ int pc_setfalcon(TBL_PC* sd, int flag)
int pc_setriding(TBL_PC* sd, int flag)
{
if( flag ){
if( pc_checkskill(sd,KN_RIDING) > 0 ) // <EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>f<EFBFBD>B<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>X<EFBFBD>L<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if( pc_checkskill(sd,KN_RIDING) > 0 ) // ???C?f?B???O?X?L??????
pc_setoption(sd, sd->sc.option|OPTION_RIDING);
} else if( pc_isriding(sd) ){
pc_setoption(sd, sd->sc.option&~OPTION_RIDING);
@ -9251,6 +9251,35 @@ static bool pc_readdb_skilltree(char* fields[], int columns, int current)
}
return true;
}
#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
static bool pc_readdb_levelpenalty(char* fields[], int columns, int current)
{
int type, race, diff;
type = atoi(fields[0]);
race = atoi(fields[1]);
diff = atoi(fields[2]);
if( type != 1 && type != 2 ){
ShowWarning("pc_readdb_levelpenalty: Invalid type %d specified.\n", type);
return false;
}
if( race < 0 && race > RC_MAX ){
ShowWarning("pc_readdb_levelpenalty: Invalid race %d specified.\n", race);
return false;
}
diff = min(diff, MAX_LEVEL);
if( diff < 0 )
diff = min(MAX_LEVEL + ( ~(diff) + 1 ), MAX_LEVEL*2);
level_penalty[type][race][diff] = atoi(fields[3]);
return true;
}
#endif
/*==========================================
* pc DB reading.
@ -9260,7 +9289,7 @@ static bool pc_readdb_skilltree(char* fields[], int columns, int current)
*------------------------------------------*/
int pc_readdb(void)
{
int i,j,k;
int i,j,k,tmp=0;
FILE *fp;
char line[24000],*p;
@ -9353,6 +9382,23 @@ int pc_readdb(void)
memset(skill_tree,0,sizeof(skill_tree));
sv_readdb(db_path, DBPATH"skill_tree.txt", ',', 3+MAX_PC_SKILL_REQUIRE*2, 4+MAX_PC_SKILL_REQUIRE*2, -1, &pc_readdb_skilltree);
#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP)
sv_readdb(db_path, "level_penalty.txt", ',', 4, 4, -1, &pc_readdb_levelpenalty);
for( k=1; k < 3; k++ ){ // fill in the blanks
for( j = 0; j < RC_MAX; j++ ){
tmp = 0;
for( i = 0; i < MAX_LEVEL*2; i++ ){
if( i == MAX_LEVEL+1 )
tmp = level_penalty[k][j][0];// reset
if( level_penalty[k][j][i] > 0 )
tmp = level_penalty[k][j][i];
else
level_penalty[k][j][i] = tmp;
}
}
}
#endif
// Reset then read attr_fix
for(i=0;i<4;i++)
for(j=0;j<ELE_MAX;j++)