fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2024-09-20 12:45:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CHG] Adjust some types for BMF functions

Browse source 
[CHG] Clean the 3D_test branch
This commit is contained in:
Crayon2000 2010-01-05 03:08:16 +00:00
parent 03c4b47695
commit cfaec61cd9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
GRRLIB/GRRLIB/GRRLIB_bmf.c
View file

@ -33,7 +33,7 @@ THE SOFTWARE.
*/ */
GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[] ) { GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[] ) {
GRRLIB_bytemapFont *fontArray = (struct GRRLIB_bytemapFont *)malloc(sizeof(GRRLIB_bytemapFont)); GRRLIB_bytemapFont *fontArray = (struct GRRLIB_bytemapFont *)malloc(sizeof(GRRLIB_bytemapFont));
int i, j = 1; u32 i, j = 1;
u8 lineheight, usedcolors, highestcolor, nbPalette; u8 lineheight, usedcolors, highestcolor, nbPalette;
short int sizeover, sizeunder, sizeinner, numcolpal; short int sizeover, sizeunder, sizeinner, numcolpal;
u16 nbPixels; u16 nbPixels;
@ -83,7 +83,7 @@ GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[] ) {
* @param bmf A GRRLIB_bytemapFont structure. * @param bmf A GRRLIB_bytemapFont structure.
*/ */
void GRRLIB_FreeBMF (const GRRLIB_bytemapFont *bmf) { void GRRLIB_FreeBMF (const GRRLIB_bytemapFont *bmf) {
unsigned int i; u16 i;
for (i=0; i<bmf->nbChar; i++) { for (i=0; i<bmf->nbChar; i++) {
free(bmf->charDef[i].data); free(bmf->charDef[i].data);

4
GRRLIB/GRRLIB/GRRLIB_print.c
View file

@ -69,7 +69,9 @@ void GRRLIB_Printf (const f32 xpos, const f32 ypos,
void GRRLIB_PrintBMF (const f32 xpos, const f32 ypos, void GRRLIB_PrintBMF (const f32 xpos, const f32 ypos,
const GRRLIB_bytemapFont *bmf, const GRRLIB_bytemapFont *bmf,
const char *text, ...) { const char *text, ...) {
uint i, j, x, y, n, size; uint i, n, size;
u16 j;
u8 x, y;
char tmp[1024]; char tmp[1024];
f32 xoff = xpos; f32 xoff = xpos;