Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
tome
Tales of MajEyal
Commits
cd1cf48b
Commit
cd1cf48b
authored
10 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
fix bad MR of effect list
parent
b7453016
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/ActorTemporaryEffects.lua
+3
-2
3 additions, 2 deletions
...ngines/default/engine/interface/ActorTemporaryEffects.lua
with
3 additions
and
2 deletions
game/engines/default/engine/interface/ActorTemporaryEffects.lua
+
3
−
2
View file @
cd1cf48b
...
...
@@ -195,7 +195,8 @@ function _M:removeEffect(eff, silent, force)
self
:
removeParticles
(
p
.
__tmpparticles
[
i
])
end
end
if
_M
.
tempeffect_def
[
eff
].
deactivate
then
_M
.
tempeffect_def
[
eff
].
deactivate
(
self
,
p
,
_M
.
tempeffect_def
[
eff
])
end
local
ed
=
_M
.
tempeffect_def
[
eff
]
if
ed
.
deactivate
then
ed
.
deactivate
(
self
,
p
,
ed
)
end
if
ed
.
lists
then
local
lists
=
ed
.
lists
if
'table'
~=
type
(
lists
)
then
lists
=
{
lists
}
end
...
...
@@ -209,7 +210,7 @@ function _M:removeEffect(eff, silent, force)
table
.
removeFromList
(
list
,
eff_id
)
end
self
:
check
(
"on_temporary_effect_removed"
,
eff
,
_M
.
tempeffect_def
[
eff
]
,
p
)
self
:
check
(
"on_temporary_effect_removed"
,
eff
,
ed
,
p
)
end
--- Copy an effect ensuring temporary values are managed properly
...
...
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