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
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
cf7adfc8
Commit
cf7adfc8
authored
1 year ago
by
sphere
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-missing-hud-entry' into 'next'
Fix missing HUD item for Lua See merge request
!2383
parents
33940e46
8ea215bf
No related branches found
No related tags found
1 merge request
!2383
Fix missing HUD item for Lua
Pipeline
#2899
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/doomdef.h
+2
-0
2 additions, 0 deletions
src/doomdef.h
src/lua_hudlib.c
+5
-0
5 additions, 0 deletions
src/lua_hudlib.c
with
7 additions
and
0 deletions
src/doomdef.h
+
2
−
0
View file @
cf7adfc8
...
@@ -82,6 +82,7 @@
...
@@ -82,6 +82,7 @@
#include
"version.h"
#include
"version.h"
#include
"doomtype.h"
#include
"doomtype.h"
#include
<assert.h>
#include
<stdarg.h>
#include
<stdarg.h>
#include
<stdio.h>
#include
<stdio.h>
#include
<stdlib.h>
#include
<stdlib.h>
...
@@ -648,6 +649,7 @@ UINT32 quickncasehash (const char *p, size_t n)
...
@@ -648,6 +649,7 @@ UINT32 quickncasehash (const char *p, size_t n)
#else
#else
#define I_Assert(e) ((void)0)
#define I_Assert(e) ((void)0)
#endif
#endif
#define I_StaticAssert(e) static_assert(e, "Static assertion failed: " #e)
// The character that separates pathnames. Forward slash on
// The character that separates pathnames. Forward slash on
// most systems, but reverse solidus (\) on Windows.
// most systems, but reverse solidus (\) on Windows.
...
...
This diff is collapsed.
Click to expand it.
src/lua_hudlib.c
+
5
−
0
View file @
cf7adfc8
...
@@ -47,6 +47,7 @@ static const char *const hud_disable_options[] = {
...
@@ -47,6 +47,7 @@ static const char *const hud_disable_options[] = {
"time"
,
"time"
,
"rings"
,
"rings"
,
"lives"
,
"lives"
,
"input"
,
"weaponrings"
,
"weaponrings"
,
"powerstones"
,
"powerstones"
,
...
@@ -70,6 +71,10 @@ static const char *const hud_disable_options[] = {
...
@@ -70,6 +71,10 @@ static const char *const hud_disable_options[] = {
"intermissionemeralds"
,
"intermissionemeralds"
,
NULL
};
NULL
};
// you know, let's actually make sure that the table is synced.
// because fuck knows how many times this has happened at this point. :v
I_StaticAssert
(
sizeof
(
hud_disable_options
)
/
sizeof
(
*
hud_disable_options
)
==
hud_MAX
+
1
);
enum
hudinfo
{
enum
hudinfo
{
hudinfo_x
=
0
,
hudinfo_x
=
0
,
hudinfo_y
,
hudinfo_y
,
...
...
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