From 96321c05f9cbf7d35bb1dae635aef433978504ac Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Tue, 19 Jul 2011 03:46:36 +0000 Subject: [PATCH] [CHG] Removed warnings from GRRLIB_LoadBMF *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) --- GRRLIB/GRRLIB/GRRLIB_bmf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/GRRLIB/GRRLIB/GRRLIB_bmf.c b/GRRLIB/GRRLIB/GRRLIB_bmf.c index 82c7e7c..30ffbef 100644 --- a/GRRLIB/GRRLIB/GRRLIB_bmf.c +++ b/GRRLIB/GRRLIB/GRRLIB_bmf.c @@ -35,19 +35,19 @@ THE SOFTWARE. GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[] ) { GRRLIB_bytemapFont *fontArray = (struct GRRLIB_bytemapFont *)malloc(sizeof(GRRLIB_bytemapFont)); u32 i, j = 1; - u8 lineheight, usedcolors, highestcolor, nbPalette, c; - short int sizeover, sizeunder, sizeinner, numcolpal; + u8 nbPalette, c/*, lineheight, usedcolors, highestcolor*/; + short int numcolpal/*, sizeover, sizeunder, sizeinner*/; u16 nbPixels; if (fontArray != NULL && my_bmf[0]==0xE1 && my_bmf[1]==0xE6 && my_bmf[2]==0xD5 && my_bmf[3]==0x1A) { fontArray->version = my_bmf[4]; - lineheight = my_bmf[5]; - sizeover = my_bmf[6]; - sizeunder = my_bmf[7]; + //lineheight = my_bmf[5]; + //sizeover = my_bmf[6]; + //sizeunder = my_bmf[7]; fontArray->tracking = my_bmf[8]; - sizeinner = my_bmf[9]; - usedcolors = my_bmf[10]; - highestcolor = my_bmf[11]; + //sizeinner = my_bmf[9]; + //usedcolors = my_bmf[10]; + //highestcolor = my_bmf[11]; nbPalette = my_bmf[16]; numcolpal = 3 * nbPalette; fontArray->palette = (u32 *)calloc(nbPalette + 1, sizeof(u32));