From 234ababd8c1a9df4391c6c54f9167f625e432dc2 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 10 Jan 2008 22:02:33 +0000 Subject: - Fixed getmonsterinfo to return "null" when returning the name of a non-existing mob instead of -1. - Extended the status_percent_damage define to include a bolean to specify whether or not the target can be killed from it. - Corrected CR_CULTIVATION to fail when the target cell has some BL_CHAR on it already. - Changed the meaning of 'flag' in status_percent_change, to enable differentiation between damage that can kill the object and damage that cannot. - Script command percentheal will no longer kill the player if the specified amount is negative (and not -100). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12051 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/script.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index a56135dd8..f63be3fb5 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -12104,7 +12104,10 @@ BUILDIN_FUNC(getmonsterinfo) mob_id = script_getnum(st,2); if (!mobdb_checkid(mob_id)) { ShowError("buildin_getmonsterinfo: Wrong Monster ID: %i", mob_id); - script_pushint(st,-1); + if ( !script_getnum(st,3) ) //requested a string + script_pushconststr(st,"null"); + else + script_pushint(st,-1); return -1; } mob = mob_db(mob_id); -- cgit v1.2.3-60-g2f50