Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
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
sphere
SRB2
Commits
40f4bd9a
Commit
40f4bd9a
authored
5 years ago
by
James R.
Browse files
Options
Downloads
Patches
Plain Diff
Can't forget to give HUD translucency to the four other calls to not V_DrawFill
parent
9123bf54
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/st_stuff.c
+12
-6
12 additions, 6 deletions
src/st_stuff.c
with
12 additions
and
6 deletions
src/st_stuff.c
+
12
−
6
View file @
40f4bd9a
...
@@ -978,14 +978,20 @@ static void ST_drawInput(void)
...
@@ -978,14 +978,20 @@ static void ST_drawInput(void)
INT32
col
;
INT32
col
;
UINT8
offs
;
UINT8
offs
;
int
translucency
;
int
translucency
;
INT32
flags
=
0
;
INT32
x
=
hudinfo
[
HUD_LIVES
].
x
,
y
=
hudinfo
[
HUD_LIVES
].
y
;
INT32
x
=
hudinfo
[
HUD_LIVES
].
x
,
y
=
hudinfo
[
HUD_LIVES
].
y
;
if
(
modeattacking
)
/* no translucency in time attack */
if
(
modeattacking
)
/* no translucency in time attack */
translucency
=
10
;
translucency
=
10
;
else
if
(
!
(
translucency
=
st_translucency
))
/* nothing to see here */
else
{
if
(
!
(
translucency
=
st_translucency
))
/* nothing to see here */
return
;
return
;
flags
|=
V_HUDTRANS
;
}
if
(
stplyr
->
powers
[
pw_carry
]
==
CR_NIGHTSMODE
)
if
(
stplyr
->
powers
[
pw_carry
]
==
CR_NIGHTSMODE
)
y
-=
16
;
y
-=
16
;
...
@@ -1111,7 +1117,7 @@ static void ST_drawInput(void)
...
@@ -1111,7 +1117,7 @@ static void ST_drawInput(void)
V_DrawFillMaybeFade(x+16+(xoffs), y+9+(yoffs), 10, 1, hudinfo[HUD_LIVES].f|29, translucency);\
V_DrawFillMaybeFade(x+16+(xoffs), y+9+(yoffs), 10, 1, hudinfo[HUD_LIVES].f|29, translucency);\
}\
}\
V_DrawFillMaybeFade(x+16+(xoffs), y+(yoffs)-offs, 10, 10, col, translucency);\
V_DrawFillMaybeFade(x+16+(xoffs), y+(yoffs)-offs, 10, 10, col, translucency);\
V_DrawCharacter(x+16+1+(xoffs), y+1+(yoffs)-offs, hudinfo[HUD_LIVES].f|symb, false)
V_DrawCharacter(x+16+1+(xoffs), y+1+(yoffs)-offs, hudinfo[HUD_LIVES].f|
flags|
symb, false)
drawbutt
(
4
,
-
3
,
BT_JUMP
,
'J'
);
drawbutt
(
4
,
-
3
,
BT_JUMP
,
'J'
);
drawbutt
(
15
,
-
3
,
BT_USE
,
'S'
);
drawbutt
(
15
,
-
3
,
BT_USE
,
'S'
);
...
@@ -1153,7 +1159,7 @@ static void ST_drawInput(void)
...
@@ -1153,7 +1159,7 @@ static void ST_drawInput(void)
if
(
stplyr
->
pflags
&
PF_AUTOBRAKE
)
if
(
stplyr
->
pflags
&
PF_AUTOBRAKE
)
{
{
V_DrawThinString
(
x
,
y
,
V_DrawThinString
(
x
,
y
,
hudinfo
[
HUD_LIVES
].
f
|
hudinfo
[
HUD_LIVES
].
f
|
flags
|
((
!
stplyr
->
powers
[
pw_carry
]
((
!
stplyr
->
powers
[
pw_carry
]
&&
(
stplyr
->
pflags
&
PF_APPLYAUTOBRAKE
)
&&
(
stplyr
->
pflags
&
PF_APPLYAUTOBRAKE
)
&&
!
(
stplyr
->
cmd
.
sidemove
||
stplyr
->
cmd
.
forwardmove
)
&&
!
(
stplyr
->
cmd
.
sidemove
||
stplyr
->
cmd
.
forwardmove
)
...
@@ -1165,12 +1171,12 @@ static void ST_drawInput(void)
...
@@ -1165,12 +1171,12 @@ static void ST_drawInput(void)
}
}
if
(
stplyr
->
pflags
&
PF_ANALOGMODE
)
if
(
stplyr
->
pflags
&
PF_ANALOGMODE
)
{
{
V_DrawThinString
(
x
,
y
,
hudinfo
[
HUD_LIVES
].
f
,
"ANALOG"
);
V_DrawThinString
(
x
,
y
,
hudinfo
[
HUD_LIVES
].
f
|
flags
,
"ANALOG"
);
y
-=
8
;
y
-=
8
;
}
}
}
}
if
(
!
demosynced
)
// should always be last, so it doesn't push anything else around
if
(
!
demosynced
)
// should always be last, so it doesn't push anything else around
V_DrawThinString
(
x
,
y
,
hudinfo
[
HUD_LIVES
].
f
|
((
leveltime
&
4
)
?
V_YELLOWMAP
:
V_REDMAP
),
"BAD DEMO!!"
);
V_DrawThinString
(
x
,
y
,
hudinfo
[
HUD_LIVES
].
f
|
flags
|
((
leveltime
&
4
)
?
V_YELLOWMAP
:
V_REDMAP
),
"BAD DEMO!!"
);
}
}
static
patch_t
*
lt_patches
[
3
];
static
patch_t
*
lt_patches
[
3
];
...
...
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