summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-01 21:35:46 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-01 21:35:46 +0000
commitd96c45b5a69548d7943b598323383ecd803f29be (patch)
treeeec66d8e63044e7416c2934836e4d6696a5eb590 /src/map/script.c
parentde5d6cb3e5c319f09c9014ce2a3bcd9041ad3323 (diff)
downloadhercules-d96c45b5a69548d7943b598323383ecd803f29be.tar.gz
hercules-d96c45b5a69548d7943b598323383ecd803f29be.tar.bz2
hercules-d96c45b5a69548d7943b598323383ecd803f29be.tar.xz
hercules-d96c45b5a69548d7943b598323383ecd803f29be.zip
- Silence will only block skills when they have begun casting, not when the cast bar is done.
- opt1 status will block skills when they are done casting only if the sc_castcancel option is set. - strcharinfo now returns blank instead of crashing the map server when there's no player attached. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5417 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c
index b37542fb3..46586c434 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4293,6 +4293,10 @@ int buildin_strcharinfo(struct script_state *st)
sd=script_rid2sd(st);
num=conv_num(st,& (st->stack->stack_data[st->start+2]));
+ if (!sd) { //Avoid crashing....
+ push_str(st->stack,C_CONSTSTR,(unsigned char *) "");
+ return 0;
+ }
if(num==0){
char *buf;
buf=(char *)aCallocA(NAME_LENGTH,sizeof(char));