mirror of
https://gitee.com/anod/open_agb_firm.git
synced 2025-05-07 14:24:12 +08:00
修正编译问题
This commit is contained in:
parent
0b62afba2f
commit
0dea9d1ccc
@ -9,11 +9,8 @@
|
||||
#include "arm11/console.h"
|
||||
#include "fs.h"
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
extern Result fReadSize( FHandle file, void *buff, unsigned size, uint32_t *readout );
|
||||
|
||||
>>>>>>> dev_cheat
|
||||
typedef struct
|
||||
{
|
||||
uint16_t start;
|
||||
|
@ -53,38 +53,6 @@ typedef struct
|
||||
char *ptrs[MAX_DIR_ENTRIES]; // For fast sorting.
|
||||
} DirList;
|
||||
|
||||
void set_screen_color( acf_callerdata_t data, acf_position_t tx, acf_position_t ty, acf_color_t b )
|
||||
{
|
||||
if( b == 0 ) return;
|
||||
|
||||
int *draw_data = data;
|
||||
u16 *frame = consoleGet()->frameBuffer;
|
||||
|
||||
int x = tx + draw_data[0];
|
||||
int y = ty + draw_data[1];
|
||||
if( 0 <= x && x < draw_data[2] && 0 <= y && y < draw_data[3] ){
|
||||
frame[ x*draw_data[3] + (draw_data[3]-1-y) ] = (u16)draw_data[4];
|
||||
}
|
||||
}
|
||||
|
||||
const char *acf_draw(int x, int y, int width, int height, int maxwidth, u16 color, const char* text)
|
||||
{
|
||||
uint8_t draw_data[sizeof(int)*5];
|
||||
|
||||
int *draw_data_int = (int*)&draw_data;
|
||||
draw_data_int[0] = x;
|
||||
draw_data_int[1] = y;
|
||||
draw_data_int[2] = width;
|
||||
draw_data_int[3] = height;
|
||||
draw_data_int[4] = color;
|
||||
|
||||
const char *retval = text;
|
||||
acf_canvas_t canvas = acf_get_canvas(maxwidth, text, NULL, NULL, &retval);
|
||||
if( !canvas ) return retval;
|
||||
acf_recycle( acf_use_canvas(canvas, set_screen_color, draw_data) );
|
||||
return retval;
|
||||
}
|
||||
|
||||
int dlistCompare(const void *a, const void *b)
|
||||
{
|
||||
const char *entA = *(char**)a;
|
||||
|
Loading…
x
Reference in New Issue
Block a user