Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
K'van
Tales of MajEyal
Commits
e9a244aa
Commit
e9a244aa
authored
10 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
fix! tssk
parent
f48b933c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
game/engines/default/engine/interface/ActorTalents.lua
+0
-6
0 additions, 6 deletions
game/engines/default/engine/interface/ActorTalents.lua
with
0 additions
and
6 deletions
game/engines/default/engine/interface/ActorTalents.lua
+
0
−
6
View file @
e9a244aa
...
...
@@ -144,8 +144,6 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent, no_
local
ok
,
ret
,
special
=
xpcall
(
function
()
return
ab
.
action
(
who
,
ab
)
end
,
debug.traceback
)
self
.
__talent_running
=
nil
if
old_target_set
then
who
.
getTarget
=
old_target
end
if
force_level
then
who
.
talents
[
id
]
=
old_level
end
if
not
ok
then
error
(
ret
)
end
...
...
@@ -169,7 +167,6 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent, no_
local
ret
=
ab
.
activate
(
who
,
ab
)
if
ret
==
true
then
ret
=
{}
end
-- fix for badly coded talents
if
ret
then
ret
.
name
=
ret
.
name
or
ab
.
name
end
if
force_level
then
who
.
talents
[
id
]
=
old_level
end
if
not
self
:
postUseTalent
(
ab
,
ret
)
then
return
end
...
...
@@ -200,7 +197,6 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent, no_
end
end
local
ret
=
ab
.
deactivate
(
who
,
ab
,
p
)
if
force_level
then
who
.
talents
[
id
]
=
old_level
end
if
not
self
:
postUseTalent
(
ab
,
ret
,
silent
)
then
return
end
...
...
@@ -269,8 +265,6 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent, no_
end
-- Cleanup in case we coroutine'd out
self
.
__talent_running
=
nil
if
old_target_set
then
who
.
getTarget
=
old_target
end
if
force_level
then
who
.
talents
[
id
]
=
old_level
end
if
not
success
and
err
then
print
(
debug.traceback
(
co_wrapper
))
self
:
onTalentLuaError
(
err
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment