diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-08-12 21:59:28 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-08-26 22:56:47 +0200 |
| commit | 7f79610cdcd5bd55de8d4e413f0679ef634b0a37 (patch) | |
| tree | ab1dba698701c80e05eb1076a807f84edb8dd4af /src/game-server/abilitycomponent.cpp | |
| parent | 3d03f5dee9c67fbbf60e1df940a91842bd8a7e4c (diff) | |
| download | manaserv-7f79610cdcd5bd55de8d4e413f0679ef634b0a37.tar.gz manaserv-7f79610cdcd5bd55de8d4e413f0679ef634b0a37.tar.bz2 manaserv-7f79610cdcd5bd55de8d4e413f0679ef634b0a37.tar.xz manaserv-7f79610cdcd5bd55de8d4e413f0679ef634b0a37.zip | |
Removed ability categories
Diffstat (limited to 'src/game-server/abilitycomponent.cpp')
| -rw-r--r-- | src/game-server/abilitycomponent.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game-server/abilitycomponent.cpp b/src/game-server/abilitycomponent.cpp index d3154490..e8113e67 100644 --- a/src/game-server/abilitycomponent.cpp +++ b/src/game-server/abilitycomponent.cpp @@ -42,7 +42,7 @@ void AbilityComponent::update(Entity &entity) if (!ability.recharged && ability.rechargeTimeout.expired()) { ability.recharged = true; - if (ability.abilityInfo->rechargedCallback) { + if (ability.abilityInfo->rechargedCallback.isValid()) { Script *script = ScriptManager::currentState(); script->prepare(ability.abilityInfo->rechargedCallback); script->push(&entity); @@ -95,7 +95,6 @@ bool AbilityComponent::abilityUseCheck(AbilityMap::iterator it) if (!ability.abilityInfo->useCallback.isValid()) { LOG_WARN("No callback for use of ability " - << ability.abilityInfo->categoryName << "/" << ability.abilityInfo->name << ". Ignoring ability."); return false; } |