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
Otowa Kotori
Tales of MajEyal
Commits
f328b494
Commit
f328b494
authored
13 years ago
by
dg
Browse files
Options
Downloads
Patches
Plain Diff
fix
git-svn-id:
http://svn.net-core.org/repos/t-engine4@3920
51575b47-30f0-44d4-a5cc-537603b46e54
parent
aba97d97
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/engines/default/engine/Actor.lua
+1
-0
1 addition, 0 deletions
game/engines/default/engine/Actor.lua
game/engines/default/engine/dialogs/ShowAchievements.lua
+1
-1
1 addition, 1 deletion
game/engines/default/engine/dialogs/ShowAchievements.lua
with
2 additions
and
1 deletion
game/engines/default/engine/Actor.lua
+
1
−
0
View file @
f328b494
...
...
@@ -150,6 +150,7 @@ end
-- @param force if true do not check for the presence of an other entity. *Use wisely*
-- @return true if a move was *ATTEMPTED*. This means the actor will probably want to use energy
function
_M
:
move
(
x
,
y
,
force
)
if
not
x
or
not
y
then
return
end
if
self
.
dead
then
return
true
end
local
map
=
game
.
level
.
map
...
...
This diff is collapsed.
Click to expand it.
game/engines/default/engine/dialogs/ShowAchievements.lua
+
1
−
1
View file @
f328b494
...
...
@@ -145,7 +145,7 @@ function _M:generateList(kind)
cache
[
img
]
=
tex
end
end
if
not
data
.
notdone
or
a
.
show
then
if
data
and
(
not
data
.
notdone
or
a
.
show
)
then
if
a
.
show
==
"full"
or
not
data
.
notdone
then
list
[
#
list
+
1
]
=
{
name
=
a
.
name
,
color
=
color
,
desc
=
a
.
desc
,
when
=
data
.
when
,
who
=
data
.
who
,
order
=
a
.
order
,
id
=
id
,
tex
=
tex
,
a
=
a
}
elseif
a
.
show
==
"none"
then
...
...
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