diff --git a/CHANGELOG.md b/CHANGELOG.md index 1426d67..0b8de66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. ## [4.4.0] - 2020-01-12 - Removed libpng, zlib, libfreetype and libjpeg from the project. These libraries should now be installed in devkitPro with pacman. -- GRRLIB and pngu are now installed into the porlibs folder. +- GRRLIB and pngu are now installed into the _porlibs_ folder instead of the _libogc_ folder. - Removed `uint` declaration. The `u32` type should be used instead. - The `GRRLIB_CreateEmptyTexture()` function is not inline anymore. @@ -93,7 +93,7 @@ All notable changes to this project will be documented in this file. ## 4.0.0 - 2009-03-05 -- Color format changed for ALL GRRLib functions (now its RGBA) to fit to GX_Color format and use `GX_Color1u32` +- Color format changed to RGBA for ALL GRRLib functions to fit to GX_Color format and use `GX_Color1u32` - `GRRLIB_LoadTexture()` now auto detect PNG or JPEG - GRRLib introduce a new texture structure (easier to handle texture width, height, etc ...) - Add `GRRLIB_InitTileSet()` to initialize a tile set @@ -106,8 +106,8 @@ All notable changes to this project will be documented in this file. - New Bitmap FX - Add `GRRLIB_Exit()` to free the memory allocated by GRRLIB -[Unreleased]: https://github.com/GRRLIB/GRRLIB/compare/4.4.0...HEAD -[4.4.0]: https://github.com/GRRLIB/GRRLIB/compare/4.3.2...4.4.0 +[Unreleased]: https://github.com/GRRLIB/GRRLIB/compare/v4.4.0...HEAD +[4.4.0]: https://github.com/GRRLIB/GRRLIB/compare/4.3.2...v4.4.0 [4.3.2]: https://github.com/GRRLIB/GRRLIB/compare/4.3.1...4.3.2 [4.3.1]: https://github.com/GRRLIB/GRRLIB/compare/4.3.0...4.3.1 [4.3.0]: https://github.com/GRRLIB/GRRLIB/compare/4.2.0...4.3.0 diff --git a/GRRLIB/GRRLIB/GRRLIB_ttf.c b/GRRLIB/GRRLIB/GRRLIB_ttf.c index 11601dd..63a47f0 100644 --- a/GRRLIB/GRRLIB/GRRLIB_ttf.c +++ b/GRRLIB/GRRLIB/GRRLIB_ttf.c @@ -131,7 +131,7 @@ void GRRLIB_PrintfTTFW(int x, int y, GRRLIB_ttfFont *myFont, const wchar_t *utf3 int penX = 0; int penY = fontSize; FT_GlyphSlot slot = Face->glyph; - FT_UInt glyphIndex = 0; + FT_UInt glyphIndex; FT_UInt previousGlyph = 0; u8 cR = R(color), cG = G(color), cB = B(color); diff --git a/examples/3D_CubedTileDemo/source/main.c b/examples/3D_CubedTileDemo/source/main.c index 952aac5..20ef376 100644 --- a/examples/3D_CubedTileDemo/source/main.c +++ b/examples/3D_CubedTileDemo/source/main.c @@ -131,12 +131,12 @@ signed int Map1Info[53][87] = int main() { int startx=0, starty=0; - int x=0, y=0; + int x, y; int dirx=0, diry=0; int cptx=0, cpty=0; int bgx=-32, bgy=-32; float idperso=0; - int i=0; + int i; float sinnonameno=0; float camZ=1400.0f; float a=0; @@ -257,11 +257,11 @@ int main() { } GRRLIB_DrawImg(bgx, bgy, tex_bg, 0, 1, 1, 0xFFFFFFFF); - for(y=0;y<=(17);y++) { - for(x=0;x<=(21);x++) { - if(Map1Data[y+starty][x+startx] != 0) { - GRRLIB_DrawTile(x*TileMap1Width+cptx-TileMap1Width,y*TileMap1Height+cpty-TileMap1Height,tex_tile1,0,1,1,0xFFFFFFFF,Map1Data[y+starty][x+startx]-1); - } + for(y=0; y<=17; y++) { + for(x=0; x<=21; x++) { + if(Map1Data[y+starty][x+startx] != 0) { + GRRLIB_DrawTile(x*TileMap1Width+cptx-TileMap1Width,y*TileMap1Height+cpty-TileMap1Height,tex_tile1,0,1,1,0xFFFFFFFF,Map1Data[y+starty][x+startx]-1); + } } } GRRLIB_DrawTile(TileMap1Width*9,TileMap1Height*6,tex_perso,0,1,1,0xFFFFFFFF,(int)idperso); diff --git a/examples/TileDemo/source/main.c b/examples/TileDemo/source/main.c index 1adb5b9..1ba3a96 100644 --- a/examples/TileDemo/source/main.c +++ b/examples/TileDemo/source/main.c @@ -129,12 +129,12 @@ signed int Map1Info[51][87] = int main() { int startx=0, starty=0; - int x=0, y=0; + int x, y; int dirx=0, diry=0; int cptx=0, cpty=0; int bgx=-32, bgy=-32; float idperso=0; - int i=0; + int i; float sinnonameno=0; GRRLIB_Init(); @@ -244,8 +244,8 @@ int main() { } GRRLIB_DrawImg(bgx, bgy, tex_bg, 0, 1, 1, 0xFFFFFFFF); - for(y=0; y<=(16); y++) { - for(x=0; x<=(21); x++) { + for(y=0; y<=16; y++) { + for(x=0; x<=21; x++) { if(Map1Data[y+starty][x+startx] != 0) { GRRLIB_DrawTile(x*TileMap1Width+cptx-TileMap1Width,y*TileMap1Height+cpty-TileMap1Height,tex_tile1,0,1,1,0xFFFFFFFF,Map1Data[y+starty][x+startx]-1); } diff --git a/examples/particle/source/main.cpp b/examples/particle/source/main.cpp index 86cfd09..3191953 100644 --- a/examples/particle/source/main.cpp +++ b/examples/particle/source/main.cpp @@ -7,7 +7,7 @@ ============================================*/ #include -#include +#include #include #include #include