mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-01-11 05:58:04 -05:00
Hopefully fixes build errors on Linux-CI.
This commit is contained in:
parent
5a97e9f0de
commit
e8d2b0cceb
@ -1,13 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
#include "z64item.h"
|
||||||
|
|
||||||
#define NOGDI
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
|
||||||
|
|
||||||
|
|
||||||
#include <message_data_static.h>
|
|
||||||
|
|
||||||
#undef MESSAGE_END
|
#undef MESSAGE_END
|
||||||
|
|
||||||
@ -20,6 +14,31 @@
|
|||||||
#define QM_YELLOW 0x46
|
#define QM_YELLOW 0x46
|
||||||
#define QM_BLACK 0x47
|
#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 {
|
typedef struct {
|
||||||
TextBoxType textBoxType;
|
TextBoxType textBoxType;
|
||||||
TextBoxPosition textBoxPos;
|
TextBoxPosition textBoxPos;
|
||||||
|
@ -57,6 +57,7 @@
|
|||||||
|
|
||||||
#include <Audio.h>
|
#include <Audio.h>
|
||||||
#include <soh/Enhancements/custom_message/CustomMessageTypes.h>
|
#include <soh/Enhancements/custom_message/CustomMessageTypes.h>
|
||||||
|
#include <functions.h>
|
||||||
|
|
||||||
OTRGlobals* OTRGlobals::Instance;
|
OTRGlobals* OTRGlobals::Instance;
|
||||||
SaveManager* SaveManager::Instance;
|
SaveManager* SaveManager::Instance;
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "vt.h"
|
#include "vt.h"
|
||||||
#include <Text.h>
|
#include <Text.h>
|
||||||
|
#include <message_data_static.h>
|
||||||
#include <soh/Enhancements/custom_message/CustomMessageManager.h>
|
#include <soh/Enhancements/custom_message/CustomMessageManager.h>
|
||||||
#include <soh/Enhancements/custom_message/CustomMessageTypes.h>
|
#include <soh/Enhancements/custom_message/CustomMessageTypes.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user