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
Merge requests
!246
Small fixes
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Small fixes
0player/t-engine4:small_fixes
into
master
Overview
0
Commits
2
Pipelines
0
Changes
Merged
Alex Ksandra
requested to merge
0player/t-engine4:small_fixes
into
master
10 years ago
Overview
0
Commits
2
Pipelines
0
Changes
-
Expand
Couple small things.
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
bc4c510a
2 commits,
10 years ago
+
4
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
Search (e.g. *.vue) (Ctrl+P)
game/modules/tome/class/Actor.lua
+
2
−
2
Options
@@ -314,7 +314,7 @@ function _M:getSpeed(speed_type)
self:getInven(self.INVEN_MAINHAND)
then
local o = self:getInven(self.INVEN_MAINHAND)[1]
if o then
if o
and self:getObjectCombat(o, "mainhand")
then
speed = self:combatSpeed(self:getObjectCombat(o, "mainhand"))
end
end
@@ -323,7 +323,7 @@ function _M:getSpeed(speed_type)
self:getInven(self.INVEN_OFFHAND)
then
local o = self:getInven(self.INVEN_OFFHAND)[1]
if o then
if o
and self:getObjectCombat(o, "offhand")
then
speed = math.max(speed or 0, self:combatSpeed(self:getObjectCombat(o, "offhand")))
end
end
Loading