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
62426363
Commit
62426363
authored
May 27, 2022
by
Richard Gobeille
Browse files
Duke3d: clang warning fixes
parent
b1331f54
Changes
3
Hide whitespace changes
Inline
Side-by-side
source/duke3d/src/actors.cpp
View file @
62426363
...
...
@@ -101,7 +101,7 @@ void G_DoConveyorInterp(int smoothratio)
auto
sect
=
&
sector
[
s
->
sectnum
];
if
((
s
->
lotag
==
SE_24_CONVEYOR
)
|
(
s
->
lotag
==
SE_34_CONVEYOR2
))
if
((
int
)(
s
->
lotag
==
SE_24_CONVEYOR
)
|
(
int
)
(
s
->
lotag
==
SE_34_CONVEYOR2
))
sect
->
floorxpanning
-=
(
uint8_t
)
mulscale16
(
65536
-
smoothratio
,
sect
->
floorxpanning
-
(
sect
->
floorxpanning
-
(
s
->
yvel
>>
7
)));
}
}
...
...
@@ -118,7 +118,7 @@ void G_ResetConveyorInterp(void)
auto
sect
=
&
sector
[
s
->
sectnum
];
if
((
s
->
lotag
==
SE_24_CONVEYOR
)
|
(
s
->
lotag
==
SE_34_CONVEYOR2
))
if
((
int
)(
s
->
lotag
==
SE_24_CONVEYOR
)
|
(
int
)
(
s
->
lotag
==
SE_34_CONVEYOR2
))
sect
->
floorxpanning
=
(
uint8_t
)
actor
[
i
].
bpos
.
x
;
}
}
...
...
source/duke3d/src/gameexec.cpp
View file @
62426363
...
...
@@ -3226,7 +3226,7 @@ badindex:
vm
.
pActor
->
lastv
=
pSprite
->
xy
;
}
if
(
tw
&&
((
vm
.
pSprite
->
statnum
==
STAT_ACTOR
)
|
(
vm
.
pSprite
->
statnum
==
STAT_STANDABLE
)))
if
(
tw
&&
((
int
)(
vm
.
pSprite
->
statnum
==
STAT_ACTOR
)
|
(
int
)
(
vm
.
pSprite
->
statnum
==
STAT_STANDABLE
)))
vm
.
pActor
->
timetosleep
=
SLEEPTIME
;
branch
(
tw
);
...
...
@@ -3249,7 +3249,7 @@ badindex:
AC_ACTION_COUNT
(
vm
.
pData
)
=
0
;
AC_CURFRAME
(
vm
.
pData
)
=
0
;
if
(
!
A_CheckEnemySprite
(
vm
.
pSprite
)
|
(
vm
.
pSprite
->
extra
>
0
))
// hack
if
(
(
int
)
!
A_CheckEnemySprite
(
vm
.
pSprite
)
|
(
int
)
(
vm
.
pSprite
->
extra
>
0
))
// hack
if
(
vm
.
pSprite
->
hitag
&
random_angle
)
vm
.
pSprite
->
ang
=
krand
()
&
2047
;
dispatch
();
...
...
@@ -3611,7 +3611,7 @@ badindex:
AC_MOVE_ID
(
vm
.
pData
)
=
*
insptr
++
;
vm
.
pSprite
->
hitag
=
*
insptr
++
;
if
(
!
A_CheckEnemySprite
(
vm
.
pSprite
)
|
(
vm
.
pSprite
->
extra
>
0
))
// hack
if
(
(
int
)
!
A_CheckEnemySprite
(
vm
.
pSprite
)
|
(
int
)
(
vm
.
pSprite
->
extra
>
0
))
// hack
if
(
vm
.
pSprite
->
hitag
&
random_angle
)
vm
.
pSprite
->
ang
=
krand
()
&
2047
;
dispatch
();
...
...
@@ -6767,7 +6767,7 @@ void A_Execute(int const spriteNum, int const playerNum, int const playerDist)
{
// hack for 1.3D fire sprites
#ifndef EDUKE32_STANDALONE
if
(
!
FURY
&&
EDUKE32_PREDICT_FALSE
(
g_scriptVersion
==
13
&&
((
vm
.
pSprite
->
picnum
==
FIRE
)
|
(
vm
.
pSprite
->
picnum
==
FIRE2
))))
if
(
!
FURY
&&
EDUKE32_PREDICT_FALSE
(
g_scriptVersion
==
13
&&
((
int
)(
vm
.
pSprite
->
picnum
==
FIRE
)
|
(
int
)
(
vm
.
pSprite
->
picnum
==
FIRE2
))))
return
;
#endif
changespritestat
(
vm
.
spriteNum
,
STAT_ZOMBIEACTOR
);
...
...
source/duke3d/src/screens.cpp
View file @
62426363
...
...
@@ -35,6 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include
"sbar.h"
#include
"screens.h"
#include
<cfloat>
#define COLOR_RED redcol
#define COLOR_WHITE whitecol
...
...
Write
Preview
Supports
Markdown
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