falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed #if DEBUG and clean up.

This commit is contained in:
Julgodis 2021-09-26 12:28:18 +02:00
parent bf12ea7a11
commit bb9dbd758f
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/JSystem/JUtility/JUTDirectPrint.h
View File

@ -2,12 +2,9 @@
#define JUTDIRECTPRINT_H
#include "JSystem/JUtility/TColor.h"
#include "Runtime.PPCEABI.H/__va_arg.h"
#include "dolphin/types.h"
struct base_process_class {};
struct __va_list_struct;
class JUTDirectPrint {
private:
/* 802E41E8 */ JUTDirectPrint();
@ -16,7 +13,8 @@ public:
/* 802E4288 */ void erase(int, int, int, int);
/* 802E431C */ void drawChar(int, int, int);
/* 802E456C */ void changeFrameBuffer(void*, u16, u16);
/* 802E45A4 */ void printSub(u16, u16, char const*, __va_list_struct*, bool);
/* -------- */ void print(u16, u16, char const*, ...);
/* 802E45A4 */ void printSub(u16, u16, char const*, va_list, bool);
/* 802E46D8 */ void drawString(u16, u16, char*);
/* 802E4708 */ void drawString_f(u16, u16, char const*, ...);
/* 802E47C8 */ void setCharColor(u8, u8, u8);
@ -24,10 +22,6 @@ public:
/* 802E4240 */ static JUTDirectPrint* start();
#if DEBUG
/* -------- */ void print(u16, u16, char const*, ...);
#endif
private:
static u8 sAsciiTable[128];
static u32 sFontData[64];

10
libs/JSystem/JUtility/JUTDirectPrint.cpp
View File

@ -272,8 +272,8 @@ void JUTDirectPrint::changeFrameBuffer(void* frameBuffer, u16 width, u16 height)
/* 802E45A4-802E46D8 2DEEE4 0134+00 1/1 0/0 0/0 .text
* printSub__14JUTDirectPrintFUsUsPCcP16__va_list_structb */
void JUTDirectPrint::printSub(u16 position_x, u16 position_y, char const* format,
__va_list_struct* args, bool clear) {
void JUTDirectPrint::printSub(u16 position_x, u16 position_y, char const* format, va_list args,
bool clear) {
char buffer[256];
if (!mFrameBuffer) {
return;
@ -308,16 +308,14 @@ void JUTDirectPrint::printSub(u16 position_x, u16 position_y, char const* format
DCStoreRange(mFrameBuffer, mFrameBufferSize);
}
#if DEBUG
void JUTDirectPrint::print(u16 position_x, u16 position_y, char const* format, ...) {
if (mFrameBuffer) {
va_list args;
va_start(args, format);
printSub(position_x, position_y, format, args);
printSub(position_x, position_y, format, args, true);
va_end(args);
}
}
#endif
/* 802E46D8-802E4708 2DF018 0030+00 0/0 2/2 0/0 .text drawString__14JUTDirectPrintFUsUsPc
*/
@ -330,7 +328,7 @@ void JUTDirectPrint::drawString_f(u16 position_x, u16 position_y, char const* fo
if (mFrameBuffer) {
va_list args;
va_start(args, format);
printSub(position_x, position_y, format, (__va_list_struct*)args, false);
printSub(position_x, position_y, format, args, false);
va_end(args);
}
}