clion pls

This commit is contained in:
PikalaxALT 2017-09-22 21:26:37 -04:00
parent fcb7e50e44
commit 4cf1150002
2 changed files with 18 additions and 16 deletions

View File

@ -94,23 +94,25 @@ struct TextPrinterSubStruct
u8 active; u8 active;
}; };
struct TextSubPrinter { // TODO: Better name
u8* current_text_offset;
u8 windowId;
u8 fontId;
u8 x;
u8 y;
u8 currentX; // 0x8
u8 currentY;
u8 letterSpacing;
u8 lineSpacing;
u8 fontColor_l:4; // 0xC
u8 fontColor_h:4;
u8 bgColor:4;
u8 shadowColor:4;
};
struct TextPrinter struct TextPrinter
{ {
struct TextSubPrinter { // TODO: Better name struct TextSubPrinter subPrinter;
u8* current_text_offset;
u8 windowId;
u8 fontId;
u8 x;
u8 y;
u8 currentX; // 0x8
u8 currentY;
u8 letterSpacing;
u8 lineSpacing;
u8 fontColor_l:4; // 0xC
u8 fontColor_h:4;
u8 bgColor:4;
u8 shadowColor:4;
} subPrinter;
void (*callback)(struct TextSubPrinter *, u16); // 0x10 void (*callback)(struct TextSubPrinter *, u16); // 0x10

View File

@ -1,9 +1,9 @@
#include "global.h" #include "global.h"
#include "text.h"
#include "main.h" #include "main.h"
#include "palette.h" #include "palette.h"
#include "string_util.h" #include "string_util.h"
#include "window.h" #include "window.h"
#include "text.h"
extern void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue); extern void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
extern void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height); extern void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height);