AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 12:35:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

bit more porting status screen to C

Browse Source
This commit is contained in:
UnknownShadow200 2018-01-10 14:03:52 +11:00
parent 200a1ac93b
commit 73d7221ca6
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Client/Screens.c
View File

@ -351,8 +351,10 @@ void StatusScreen_ContextRecreated(void) {
status.SetText(msg);
posAtlas = new TextAtlas(game, 16);
posAtlas.Pack("0123456789-, ()", font, "Position: ");
posAtlas.tex.Y = (short)(status.Height + 2);
String chars = String_FromConst("0123456789-, ()");
String prefix = String_FromConst("Position: ");
TextAtlas_Make(&screen->PosAtlas, &chars, &screen->Font, &prefix);
screen->PosAtlas.Tex.Y = (Int16)(status.Height + 2);
Int32 yOffset = status.Height + posAtlas.tex.Height + 2;
hackStates = new TextWidget(game, font)
@ -444,13 +446,13 @@ Screen* StatusScreen_MakeInstance(void) {
return &screen->Base;
}
void StatusScreen_Reset(void) {
void StatusScreen_Ready(void) {
GuiElement* elem = &StatusScreen_Instance.Base.Base;
elem->Init(elem);
}
IGameComponent StatusScreen_MakeComponent(void) {
IGameComponent comp = IGameComponent_MakeEmpty();
comp.Reset = StatusScreen_Reset;
comp.Ready = StatusScreen_Ready;
return comp;
}

2
src/Client/Screens.h
View File

@ -17,6 +17,8 @@ typedef struct ClickableScreen_ {
void ClickableScreen_Create(ClickableScreen* screen);
Screen* InventoryScreen_MakeInstance(void);
Screen* StatusScreen_MakeInstance(void);
IGameComponent StatusScreen_MakeComponent(void);
/* Raw pointer to inventory screen. DO NOT USE THIS. Use InventoryScreen_MakeInstance() */
extern Screen* InventoryScreen_UNSAFE_RawPointer;

5
src/Client/Widgets.c
View File

@ -54,7 +54,7 @@ void TextWidget_Reposition(Widget* elem) {
widget->Texture.Y += elem->Y - oldY;
}
void TextWidget_Create(TextWidget* widget, STRING_PURE String* text, FontDesc* font) {
void TextWidget_Make(TextWidget* widget, FontDesc* font) {
Widget_Init(&widget->Base);
PackedCol col = PACKEDCOL_WHITE;
widget->Col = col;
@ -63,7 +63,10 @@ void TextWidget_Create(TextWidget* widget, STRING_PURE String* text, FontDesc* f
widget->Base.Base.Init = TextWidget_Init;
widget->Base.Base.Render = TextWidget_Render;
widget->Base.Base.Free = TextWidget_Free;
}
void TextWidget_Create(TextWidget* widget, STRING_PURE String* text, FontDesc* font) {
TextWidget_Make(widget, font);
GuiElement* elem = &widget->Base.Base;
elem->Init(elem);
TextWidget_SetText(widget, text);

1
src/Client/Widgets.h
View File

@ -22,6 +22,7 @@ typedef struct TextWidget_ {
PackedCol Col;
} TextWidget;
void TextWidget_Make(TextWidget* widget, FontDesc* font);
void TextWidget_Create(TextWidget* widget, STRING_PURE String* text, FontDesc* font);
void TextWidget_SetText(TextWidget* widget, STRING_PURE String* text);