Skip to content
Snippets Groups Projects
Commit cf7adfc8 authored by sphere's avatar sphere
Browse files

Merge branch 'fix-missing-hud-entry' into 'next'

Fix missing HUD item for Lua

See merge request STJr/SRB2!2383
parents 33940e46 8ea215bf
No related branches found
No related tags found
No related merge requests found
...@@ -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.
......
...@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment