Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
illuna-minetest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Service Desk
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
Illuna-Minetest
illuna-minetest
Commits
8e67f4c4
Commit
8e67f4c4
authored
13 years ago
by
Mark Holmquist
Committed by
Giuseppe Bilotta
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed a few problems in the ladder update, and changed the speed to account for gravity
parent
1c59cff8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/content_mapblock.cpp
+2
-2
2 additions, 2 deletions
src/content_mapblock.cpp
src/game.cpp
+1
-1
1 addition, 1 deletion
src/game.cpp
src/player.cpp
+3
-3
3 additions, 3 deletions
src/player.cpp
with
6 additions
and
6 deletions
src/content_mapblock.cpp
+
2
−
2
View file @
8e67f4c4
...
...
@@ -1134,7 +1134,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
u16
indices
[]
=
{
0
,
1
,
2
,
2
,
3
,
0
};
collector
.
append
(
material_rail
,
vertices
,
4
,
indices
,
6
);
}
else
if
(
n
.
d
==
CONTENT_LADDER
)
{
else
if
(
n
.
getContent
()
==
CONTENT_LADDER
)
{
u8
l
=
decode_light
(
n
.
getLightBlend
(
data
->
m_daynight_ratio
));
video
::
SColor
c
(
255
,
l
,
l
,
l
);
...
...
@@ -1149,7 +1149,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
video
::
S3DVertex
(
BS
/
2
-
d
,
BS
/
2
,
-
BS
/
2
,
0
,
0
,
0
,
c
,
0
,
0
),
};
v3s16
dir
=
unpackDir
(
n
.
dir
);
v3s16
dir
=
unpackDir
(
n
.
param2
);
for
(
s32
i
=
0
;
i
<
4
;
i
++
)
{
...
...
This diff is collapsed.
Click to expand it.
src/game.cpp
+
1
−
1
View file @
8e67f4c4
...
...
@@ -541,7 +541,7 @@ void getPointedNode(Client *client, v3f player_position,
else
if
(
n
.
getContent
()
==
CONTENT_LADDER
)
{
v3s16
dir
=
unpackDir
(
n
.
dir
);
v3s16
dir
=
unpackDir
(
n
.
param2
);
v3f
dir_f
=
v3f
(
dir
.
X
,
dir
.
Y
,
dir
.
Z
);
dir_f
*=
BS
/
2
-
BS
/
6
-
BS
/
20
;
v3f
cpf
=
npf
+
dir_f
;
...
...
This diff is collapsed.
Click to expand it.
src/player.cpp
+
3
−
3
View file @
8e67f4c4
...
...
@@ -382,8 +382,8 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
try
{
v3s16
pp
=
floatToInt
(
position
+
v3f
(
0
,
0.5
*
BS
,
0
),
BS
);
v3s16
pp2
=
floatToInt
(
position
+
v3f
(
0
,
-
0.2
*
BS
,
0
),
BS
);
is_climbing
=
(
content_features
(
map
.
getNode
(
pp
).
d
).
climbable
||
content_features
(
map
.
getNode
(
pp2
).
d
).
climbable
);
is_climbing
=
(
content_features
(
map
.
getNode
(
pp
).
getContent
()
).
climbable
||
content_features
(
map
.
getNode
(
pp2
).
getContent
()
).
climbable
);
}
catch
(
InvalidPositionException
&
e
)
{
...
...
@@ -832,7 +832,7 @@ void LocalPlayer::applyControl(float dtime)
if
(
is_climbing
)
{
if
(
control
.
up
||
control
.
left
||
control
.
right
||
control
.
down
)
{
v3f
speed
=
getSpeed
();
speed
.
Y
=
2
*
BS
;
speed
.
Y
=
2
.5
*
BS
;
setSpeed
(
speed
);
}
else
{
...
...
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