Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Richard Gobeille
EDuke32
Commits
e3946bf8
Commit
e3946bf8
authored
Jun 11, 2020
by
Richard Gobeille
Browse files
Duke3d: fix GREENSLIME issue introduced by
6335a9a2
parent
1bc4d5fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
source/duke3d/src/actors.cpp
View file @
e3946bf8
...
@@ -4754,12 +4754,12 @@ ACTOR_STATIC void G_MoveActors(void)
...
@@ -4754,12 +4754,12 @@ ACTOR_STATIC void G_MoveActors(void)
pSprite
->
cstat
=
(
playerDist
<
1596
)
?
0
:
257
;
pSprite
->
cstat
=
(
playerDist
<
1596
)
?
0
:
257
;
if
(
pData
[
0
]
==
GREENSLIME_ONPLAYER
&&
pPlayer
->
somethingonplayer
==
spriteNum
)
if
(
pData
[
0
]
==
GREENSLIME_ONPLAYER
)
{
{
if
(
sprite
[
pPlayer
->
i
].
extra
<
1
)
if
(
sprite
[
pPlayer
->
i
].
extra
<
1
&&
pPlayer
->
somethingonplayer
==
spriteNum
)
{
{
pPlayer
->
somethingonplayer
=
-
1
;
pPlayer
->
somethingonplayer
=
-
1
;
pData
[
0
]
=
GREENSLIME_
DONEEATING
;
pData
[
0
]
=
GREENSLIME_
TOFLOOR
;
goto
next_sprite
;
goto
next_sprite
;
}
}
...
@@ -4842,10 +4842,9 @@ ACTOR_STATIC void G_MoveActors(void)
...
@@ -4842,10 +4842,9 @@ ACTOR_STATIC void G_MoveActors(void)
goto
next_sprite
;
goto
next_sprite
;
}
}
else
if
(
pSprite
->
xvel
<
64
&&
playerDist
<
768
)
else
if
(
pSprite
->
xvel
<
64
&&
playerDist
<
768
)
{
{
if
(
pPlayer
->
somethingonplayer
==
-
1
)
if
(
pPlayer
->
somethingonplayer
==
-
1
&&
sprite
[
pPlayer
->
i
].
extra
>
0
)
{
{
pPlayer
->
somethingonplayer
=
spriteNum
;
pPlayer
->
somethingonplayer
=
spriteNum
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment