diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-07-30 13:12:03 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-07-30 13:12:03 +0200 |
| commit | a6339282371856e3f0df7712644dbd53c6c13cf8 (patch) | |
| tree | dd4c87919cc395141c1ef91ab2c5936225478724 /src/scripting | |
| parent | 151f6acdee17556d249e1b61f264ed2e95b84354 (diff) | |
| parent | b176a462662c719cca6d9d444ff1c5892c7c77d3 (diff) | |
| download | manaserv-a6339282371856e3f0df7712644dbd53c6c13cf8.tar.gz manaserv-a6339282371856e3f0df7712644dbd53c6c13cf8.tar.bz2 manaserv-a6339282371856e3f0df7712644dbd53c6c13cf8.tar.xz manaserv-a6339282371856e3f0df7712644dbd53c6c13cf8.zip | |
Merge branch 'master' of gitorious.org:mana/manaserv
Conflicts:
src/game-server/itemmanager.cpp
Diffstat (limited to 'src/scripting')
| -rw-r--r-- | src/scripting/script.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp index 359e94bd..8aa450b8 100644 --- a/src/scripting/script.cpp +++ b/src/scripting/script.cpp @@ -132,11 +132,17 @@ void Script::addDataToSpecial(int id, Special* special) first we have to agree on what other info we actually want to provide. */ - Script *script = Script::special_actions_script; - script->prepare("get_special_recharge_cost"); - script->push(id); - int scriptReturn = script->execute(); - special->neededMana = scriptReturn; + if (special) + { + Script *script = Script::special_actions_script; + if (script) + { + script->prepare("get_special_recharge_cost"); + script->push(id); + int scriptReturn = script->execute(); + special->neededMana = scriptReturn; + } + } } |