diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-19 05:56:01 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-19 05:56:01 +0000 |
| commit | 4f5f759f09c2cd938aae953d4471148c39305679 (patch) | |
| tree | 653908dfb09146e346e44c170e81f44548a1a45b /src/map/script.c | |
| parent | 8b335514d717b0b9fee0f2203a7b9bef7fbb15ea (diff) | |
| download | hercules-4f5f759f09c2cd938aae953d4471148c39305679.tar.gz hercules-4f5f759f09c2cd938aae953d4471148c39305679.tar.bz2 hercules-4f5f759f09c2cd938aae953d4471148c39305679.tar.xz hercules-4f5f759f09c2cd938aae953d4471148c39305679.zip | |
- Added 22nd argument to 'getmonsterinfo' which returns the mvp_exp of a monster.
- Changed 'checkvending' to return 2 if player is using @autotrade.
- Follow up to r15871: used spaces so everything lines up (people might use different Tab Size in their text editors).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15872 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c index 549e14266..d58233dc5 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -13922,6 +13922,7 @@ BUILDIN_FUNC(getmonsterinfo) case 19: script_pushint(st,mob->status.race); break; case 20: script_pushint(st,mob->status.def_ele); break; case 21: script_pushint(st,mob->status.mode); break; + case 22: script_pushint(st,mob->mexp); break; default: script_pushint(st,-1); //wrong Index } return 0; @@ -13937,7 +13938,7 @@ BUILDIN_FUNC(checkvending) // check vending [Nab4] sd = script_rid2sd(st); if(sd) - script_pushint(st,sd->state.vending); + script_pushint(st, sd->state.autotrade ? 2 : sd->state.vending); else script_pushint(st,0); |