PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build 

Former-commit-id: b25989694f
This commit is contained in:
Henrique Gemignani Passos Lima 2023-01-30 23:21:55 +02:00
parent 020542afea
commit f6120c7bde
3 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/GuiSys/CGuiTextSupport.hpp
View File

@ -1,44 +1,19 @@
#ifndef _CGUITEXTSUPPORT #ifndef _CGUITEXTSUPPORT
#define _CGUITEXTSUPPORT #define _CGUITEXTSUPPORT
#include "Kyoto/SObjectTag.hpp"
#include "Kyoto/Text/TextCommon.hpp"
#include "rstl/string.hpp" #include "rstl/string.hpp"
#include "rstl/vector.hpp" #include "rstl/vector.hpp"
#include "rstl/pair.hpp"
class CColor; class CColor;
class CGuiFrame; class CGuiFrame;
class CTextExecuteBuffer; class CTextExecuteBuffer;
class CTextParser; class CTextParser;
class CSimplePool;
enum EJustification {
kJ_Left = 0,
kJ_Center,
kJ_Right,
kJ_Full,
kJ_NLeft,
kJ_NCenter,
kJ_NRight,
kJ_LeftMono,
kJ_CenterMono,
kJ_RightMono,
};
enum EVerticalJustification {
kVJ_Top = 0,
kVJ_Center,
kVJ_Bottom,
kVJ_Full,
kVJ_NTop,
kVJ_NCenter,
kVJ_NBottom,
kVJ_TopMono,
kVJ_CenterMono,
kVJ_RightMono,
};
enum ETextDirection {
kTD_Horizontal,
kTD_Vertical,
};
class CGuiTextProperties { class CGuiTextProperties {
friend class CGuiTextSupport; friend class CGuiTextSupport;

2
include/dolphin/dvd.h
View File

@ -92,7 +92,7 @@ void DVDReset();
s32 DVDCancel(DVDCommandBlock* block); s32 DVDCancel(DVDCommandBlock* block);
BOOL DVDOpen(char* fileName, DVDFileInfo* fileInfo); BOOL DVDOpen(char* fileName, DVDFileInfo* fileInfo);
BOOL DVDFastOpen(s32 entrynum, DVDFileInfo* fileInfo); BOOL DVDFastOpen(s32 entrynum, DVDFileInfo* fileInfo);
s32 DVDGetCommandBlockStatus(DVDCommandBlock* block); s32 DVDGetCommandBlockStatus(const DVDCommandBlock* block);
BOOL DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback); BOOL DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback);
s32 DVDCancel(DVDCommandBlock* block); s32 DVDCancel(DVDCommandBlock* block);
BOOL DVDCancelAllAsync(DVDCBCallback callback); BOOL DVDCancelAllAsync(DVDCBCallback callback);

2
src/MetroidPrime/CCredits.cpp
View File

@ -59,7 +59,7 @@ CIOWin::EMessageReturn CCredits::Update(float dt, CArchitectureQueue& queue) {
x30_text.push_back(rstl::pair< rstl::single_ptr< CGuiTextSupport >, CVector2i >( x30_text.push_back(rstl::pair< rstl::single_ptr< CGuiTextSupport >, CVector2i >(
new CGuiTextSupport( new CGuiTextSupport(
gpResourceFactory->GetResourceIdByName(gpTweakGui->GetCreditsFont().data())->id, gpResourceFactory->GetResourceIdByName(gpTweakGui->GetCreditsFont().data())->id,
CGuiTextProperties(true, true, kJ_Center, kVJ_Top), CGuiTextProperties(true, true, kJustification_Center, kVerticalJustification_Top),
gpTweakGui->GetCreditsTextFontColor(), gpTweakGui->GetCreditsTextBorderColor(), gpTweakGui->GetCreditsTextFontColor(), gpTweakGui->GetCreditsTextBorderColor(),
CColor::White(), CGraphics::GetViewport().mWidth - 64, 0, gpSimplePool, CColor::White(), CGraphics::GetViewport().mWidth - 64, 0, gpSimplePool,
CGuiWidget::kGMDF_Alpha), CGuiWidget::kGMDF_Alpha),