diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-07 04:15:39 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-07 04:15:39 +0000 |
| commit | 2fd138bcf99d5dae36069b715363029f07a5e057 (patch) | |
| tree | 9eb5b6de5b7effa979c2fd8d43fd04f4532358a9 /src/map/script.c | |
| parent | 7b72dcdc54c991a85565edb14e86e16a6b1fbda7 (diff) | |
| download | hercules-2fd138bcf99d5dae36069b715363029f07a5e057.tar.gz hercules-2fd138bcf99d5dae36069b715363029f07a5e057.tar.bz2 hercules-2fd138bcf99d5dae36069b715363029f07a5e057.tar.xz hercules-2fd138bcf99d5dae36069b715363029f07a5e057.zip | |
- Some corrections due to the guild skill position change.
- Removed file todo-for-stable as it's impossible to keep it updated :X
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5479 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/src/map/script.c b/src/map/script.c index b0bc77171..b615a935c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4370,33 +4370,30 @@ int buildin_strcharinfo(struct script_state *st) return 0;
}
num=conv_num(st,& (st->stack->stack_data[st->start+2]));
- if(sd){
- switch(num){
- case 0:
- buf=(char *)aCallocA(NAME_LENGTH,sizeof(char));
- memcpy(buf, sd->status.name, NAME_LENGTH-1);
+ switch(num){
+ case 0:
+ buf=(char *)aCallocA(NAME_LENGTH,sizeof(char));
+ memcpy(buf, sd->status.name, NAME_LENGTH-1);
+ push_str(st->stack,C_STR,(unsigned char *) buf);
+ break;
+ case 1:
+ buf=buildin_getpartyname_sub(sd->status.party_id);
+ if(buf!=0)
push_str(st->stack,C_STR,(unsigned char *) buf);
- break;
- case 1:
- buf=buildin_getpartyname_sub(sd->status.party_id);
- if(buf!=0)
- push_str(st->stack,C_STR,(unsigned char *) buf);
- else
- push_str(st->stack,C_CONSTSTR,(unsigned char *) "");
- break;
- case 2:
- buf=buildin_getguildname_sub(sd->status.guild_id);
- if(buf != NULL)
- push_str(st->stack,C_STR,(unsigned char *) buf);
- else
- push_str(st->stack,C_CONSTSTR,(unsigned char *) "");
- break;
- default:
- ShowWarning("buildin_strcharinfo: unknown parameter.");
- break;
- }
- } else {
- push_str(st->stack,C_CONSTSTR,(unsigned char *) "");
+ else
+ push_str(st->stack,C_CONSTSTR,(unsigned char *) "");
+ break;
+ case 2:
+ buf=buildin_getguildname_sub(sd->status.guild_id);
+ if(buf != NULL)
+ push_str(st->stack,C_STR,(unsigned char *) buf);
+ else
+ push_str(st->stack,C_CONSTSTR,(unsigned char *) "");
+ break;
+ default:
+ ShowWarning("buildin_strcharinfo: unknown parameter.");
+ push_str(st->stack,C_CONSTSTR,(unsigned char *) "");
+ break;
}
return 0;
@@ -9058,7 +9055,7 @@ int buildin_summon(struct script_state *st) md->master_id=sd->bl.id;
md->special_state.ai=1;
md->mode=mob_db(md->class_)->mode|0x04;
- md->deletetimer=add_timer(tick+(timeout<=0?timeout*1000:60000),mob_timer_delete,id,0);
+ md->deletetimer=add_timer(tick+(timeout>0?timeout*1000:60000),mob_timer_delete,id,0);
clif_misceffect2(&md->bl,344);
}
clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,sd->bl.x,sd->bl.y,tick);
|