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

[CHG] Removed warnings from GRRLIB_LoadBMF

Browse source 
*Branch 3D_test*
[CHG] We are now loading texture from Material file (.mtl)
[CHG] Draw3dObj is able to show diffuse texture map (only for group)
[CHG] Draw3dObj overrides the two last parameters of GRRLIB_3dMode (bool texturemode and bool normalmode)
This commit is contained in:
Crayon2000 2011-07-19 03:46:36 +00:00
parent 0f4765cf1d
commit 96321c05f9
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
GRRLIB/GRRLIB/GRRLIB_bmf.c
View file

@ -35,19 +35,19 @@ 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));
u32 i, j = 1; u32 i, j = 1;
u8 lineheight, usedcolors, highestcolor, nbPalette, c; u8 nbPalette, c/*, lineheight, usedcolors, highestcolor*/;
short int sizeover, sizeunder, sizeinner, numcolpal; short int numcolpal/*, sizeover, sizeunder, sizeinner*/;
u16 nbPixels; u16 nbPixels;
if (fontArray != NULL && my_bmf[0]==0xE1 && my_bmf[1]==0xE6 && my_bmf[2]==0xD5 && my_bmf[3]==0x1A) { if (fontArray != NULL && my_bmf[0]==0xE1 && my_bmf[1]==0xE6 && my_bmf[2]==0xD5 && my_bmf[3]==0x1A) {
fontArray->version = my_bmf[4]; fontArray->version = my_bmf[4];
lineheight = my_bmf[5]; //lineheight = my_bmf[5];
sizeover = my_bmf[6]; //sizeover = my_bmf[6];
sizeunder = my_bmf[7]; //sizeunder = my_bmf[7];
fontArray->tracking = my_bmf[8]; fontArray->tracking = my_bmf[8];
sizeinner = my_bmf[9]; //sizeinner = my_bmf[9];
usedcolors = my_bmf[10]; //usedcolors = my_bmf[10];
highestcolor = my_bmf[11]; //highestcolor = my_bmf[11];
nbPalette = my_bmf[16]; nbPalette = my_bmf[16];
numcolpal = 3 * nbPalette; numcolpal = 3 * nbPalette;
fontArray->palette = (u32 *)calloc(nbPalette + 1, sizeof(u32)); fontArray->palette = (u32 *)calloc(nbPalette + 1, sizeof(u32));