mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-08-14 10:37:17 -07:00
Convert RandomizerInf
to the dynamic #define
model to allow for automatic string names. (#5537)
This commit is contained in:
parent
2b360d4bbe
commit
40fa3c8d64
7 changed files with 1926 additions and 3241 deletions
|
@ -12,7 +12,6 @@ extern "C"
|
|||
|
||||
#include "luslog.h"
|
||||
#include <soh/Enhancements/item-tables/ItemTableTypes.h>
|
||||
#include <soh/Enhancements/randomizer/randomizer_inf.h>
|
||||
|
||||
#if defined(INCLUDE_GAME_PRINTF) && defined(_DEBUG)
|
||||
#define osSyncPrintf(fmt, ...) lusprintf(__FILE__, __LINE__, 0, fmt, ##__VA_ARGS__)
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "z64math.h"
|
||||
#include "z64audio.h"
|
||||
#include "soh/Enhancements/randomizer/randomizerTypes.h"
|
||||
#include "soh/Enhancements/randomizer/randomizer_inf.h"
|
||||
#include "soh/Enhancements/gameplaystats.h"
|
||||
#include "soh/Enhancements/randomizer/randomizer_entrance.h"
|
||||
#include "soh/Enhancements/boss-rush/BossRushTypes.h"
|
||||
|
|
|
@ -554,6 +554,10 @@ void DrawFlagTableArray16(const FlagTable& flagTable, uint16_t row, uint16_t& fl
|
|||
uint32_t bitMask = 1 << flagIndex;
|
||||
ImVec4 themeColor = ColorValues.at(THEME_COLOR);
|
||||
ImVec4 colorDark = { themeColor.x * 0.4f, themeColor.y * 0.4f, themeColor.z * 0.4f, themeColor.z };
|
||||
ImVec4& color = themeColor;
|
||||
if (!hasDescription) {
|
||||
color = colorDark;
|
||||
}
|
||||
PushStyleCheckbox(hasDescription ? themeColor : colorDark);
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0f, 3.0f));
|
||||
bool flag = (flags & bitMask) != 0;
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <z64.h>
|
||||
#include "soh/Enhancements/item-tables/ItemTableTypes.h"
|
||||
#include "randomizer_inf.h"
|
||||
#include "randomizerTypes.h"
|
||||
|
||||
typedef struct FairyIdentity {
|
||||
RandomizerInf randomizerInf;
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
#include <stdint.h>
|
||||
#include "z64item.h"
|
||||
#include "randomizer_inf.h"
|
||||
|
||||
#define MAX_TRICK_NAME_SIZE 50
|
||||
|
||||
|
@ -214,6 +213,15 @@ typedef enum {
|
|||
LOGIC_MAX
|
||||
} LogicVal;
|
||||
|
||||
#define DEFINE_RAND_INF(enum) enum,
|
||||
|
||||
typedef enum {
|
||||
#include "randomizer_inf.h"
|
||||
RAND_INF_MAX,
|
||||
} RandomizerInf;
|
||||
|
||||
#undef DEFINE_RAND_INF
|
||||
|
||||
typedef enum {
|
||||
RA_NONE,
|
||||
RA_LINKS_POCKET,
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue