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

fixed the spiritball timer list [Shinomori]

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1109 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shinomori 2005-02-15 09:44:00 +00:00
parent e35474dbaa
commit 2c801c4a19
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/map/pc.c
View File

@ -183,7 +183,9 @@ static int pc_spiritball_timer(int tid,unsigned int tick,int id,int data) {
}
sd->spiritball--;
memcpy( &sd->spirit_timer[0], &sd->spirit_timer[1], sizeof(sd->spirit_timer[0]) * sd->spiritball );
// I leave this here as bad example [Shinomori]
//memcpy( &sd->spirit_timer[0], &sd->spirit_timer[1], sizeof(sd->spirit_timer[0]) * sd->spiritball );
memmove( sd->spirit_timer+0, sd->spirit_timer+1, (sd->spiritball)*sizeof(int) );
sd->spirit_timer[sd->spiritball]=-1;
clif_spiritball(sd);
@ -202,7 +204,10 @@ int pc_addspiritball(struct map_session_data *sd,int interval,int max) {
if(sd->spiritball >= max) {
if(sd->spirit_timer[0] != -1)
delete_timer(sd->spirit_timer[0],pc_spiritball_timer);
memcpy( &sd->spirit_timer[0], &sd->spirit_timer[1], sizeof(sd->spirit_timer[0]) * (sd->spiritball - 1));
// I leave this here as bad example [Shinomori]
//memcpy( &sd->spirit_timer[0], &sd->spirit_timer[1], sizeof(sd->spirit_timer[0]) * (sd->spiritball - 1));
memmove( sd->spirit_timer+0, sd->spirit_timer+1, (sd->spiritball - 1)*sizeof(int) );
//sd->spirit_timer[sd->spiritball-1] = -1; // intentionally, but will be overwritten
} else
sd->spiritball++;
@ -3007,14 +3012,14 @@ static int pc_walk(int tid,unsigned int tick,int id,int data)
sd->inchealspiritsptick = 0;
sd->walkpath.path_half ^= 1;
if(sd->walkpath.path_half==0){ // ƒ}ƒX–Ú’†<E28099>S‚Ö“r…
if(sd->walkpath.path_half==0){ // マス目中心へ途
sd->walkpath.path_pos++;
if(sd->state.change_walk_target){
pc_walktoxy_sub(sd);
return 0;
}
} else { // ƒ}ƒX–Ú‹«ŠE‚Ö“r…
} else { // マス目境界へ途
if(sd->walkpath.path[sd->walkpath.path_pos]>=8)
return 1;