anod/oaf-boost
1
0
Fork 0
mirror of https://gitee.com/anod/open_agb_firm.git synced 2025-05-11 19:26:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修正编译问题

Browse Source
This commit is contained in:
root 2023-03-13 11:10:55 +08:00
parent 0b62afba2f
commit 0dea9d1ccc
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/arm11/acf.c
View File

@ -9,11 +9,8 @@
#include "arm11/console.h" #include "arm11/console.h"
#include "fs.h" #include "fs.h"
<<<<<<< HEAD
=======
extern Result fReadSize( FHandle file, void *buff, unsigned size, uint32_t *readout ); extern Result fReadSize( FHandle file, void *buff, unsigned size, uint32_t *readout );
>>>>>>> dev_cheat
typedef struct typedef struct
{ {
uint16_t start; uint16_t start;

32
source/arm11/filebrowser.c
View File

@ -53,38 +53,6 @@ typedef struct
char *ptrs[MAX_DIR_ENTRIES]; // For fast sorting. char *ptrs[MAX_DIR_ENTRIES]; // For fast sorting.
} DirList; } 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) int dlistCompare(const void *a, const void *b)
{ {
const char *entA = *(char**)a; const char *entA = *(char**)a;