Hopefully fixes build errors on Linux-CI.

This commit is contained in:
Christopher Leggett 2022-07-26 20:46:49 -04:00
parent 5a97e9f0de
commit e8d2b0cceb
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
3 changed files with 28 additions and 7 deletions

View File

@ -1,13 +1,7 @@
#pragma once
#include <string>
#include <unordered_map>
#define NOGDI
#define WIN32_LEAN_AND_MEAN
#include <message_data_static.h>
#include "z64item.h"
#undef MESSAGE_END
@ -20,6 +14,31 @@
#define QM_YELLOW 0x46
#define QM_BLACK 0x47
#ifndef MESSAGE_DATA_STATIC_H
typedef enum {
/* 0 */ TEXTBOX_TYPE_BLACK,
/* 1 */ TEXTBOX_TYPE_WOODEN,
/* 2 */ TEXTBOX_TYPE_BLUE,
/* 3 */ TEXTBOX_TYPE_OCARINA,
/* 4 */ TEXTBOX_TYPE_NONE_BOTTOM,
/* 5 */ TEXTBOX_TYPE_NONE_NO_SHADOW,
/* 11 */ TEXTBOX_TYPE_CREDITS = 11
} TextBoxType;
typedef enum {
/* 0 */ TEXTBOX_BG_CROSS
} TextBoxBackground;
typedef enum {
/* 0 */ TEXTBOX_POS_VARIABLE,
/* 1 */ TEXTBOX_POS_TOP,
/* 2 */ TEXTBOX_POS_MIDDLE,
/* 3 */ TEXTBOX_POS_BOTTOM
} TextBoxPosition;
#endif
typedef struct {
TextBoxType textBoxType;
TextBoxPosition textBoxPos;

View File

@ -57,6 +57,7 @@
#include <Audio.h>
#include <soh/Enhancements/custom_message/CustomMessageTypes.h>
#include <functions.h>
OTRGlobals* OTRGlobals::Instance;
SaveManager* SaveManager::Instance;

View File

@ -5,6 +5,7 @@
#include "global.h"
#include "vt.h"
#include <Text.h>
#include <message_data_static.h>
#include <soh/Enhancements/custom_message/CustomMessageManager.h>
#include <soh/Enhancements/custom_message/CustomMessageTypes.h>