fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2024-11-22 15:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CHG] Cleanup

Browse source
This commit is contained in:
Crayon2000 2009-12-15 21:43:57 +00:00
parent d61ac3d4d8
commit 280538ebec
2 changed files with 77 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/TileDemo/Makefile
View file

@ -17,7 +17,7 @@ include $(DEVKITPPC)/wii_rules
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
TARGET := $(notdir $(CURDIR)) TARGET := $(notdir $(CURDIR))
BUILD := build BUILD := build
SOURCES := source source/gfx GRRLIB_addon SOURCES := source source/gfx
DATA := data DATA := data
INCLUDES := INCLUDES :=
@ -33,7 +33,7 @@ LDFLAGS = -g $(MACHDEP) -mrvl -Wl,-Map,$(notdir $@).map
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project # any extra libraries we wish to link with the project
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := -lmodplay -lasnd -lgrrlib -lpngu -lpng -ljpeg -lz -lfat -lwiiuse -lbte -logc -lm LIBS := -lgrrlib -lpngu -lpng -ljpeg -lz -lfat -lwiiuse -lbte -logc -lm
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing

25
examples/TileDemo/source/main.c
View file

@ -9,8 +9,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include <asndlib.h>
#include <gcmodplay.h>
#include "gfx/tile1.h" #include "gfx/tile1.h"
#include "gfx/perso.h" #include "gfx/perso.h"
@ -182,8 +180,7 @@ float sinnonameno=0, oldsinnonameno=0;
idperso=1; idperso=1;
} }
} }
else if(dirx>0) {
if(dirx>0){
if((Map1Info[7+starty][9+startx]==8) || (Map1Info[7+starty][9+startx]==2) || (Map1Info[8+starty][9+startx]==8) || (Map1Info[8+starty][9+startx]==2)) { if((Map1Info[7+starty][9+startx]==8) || (Map1Info[7+starty][9+startx]==2) || (Map1Info[8+starty][9+startx]==8) || (Map1Info[8+starty][9+startx]==2)) {
dirx=0; dirx=0;
} }
@ -199,7 +196,6 @@ float sinnonameno=0, oldsinnonameno=0;
diry=0; diry=0;
} }
} }
if(diry!=0) { if(diry!=0) {
idperso++; idperso++;
if(idperso>22) if(idperso>22)
@ -217,16 +213,17 @@ float sinnonameno=0, oldsinnonameno=0;
dirx=0; dirx=0;
startx--; startx--;
} }
else if(cptx==-32) {
if(cptx==-32){
cptx=0; cptx=0;
dirx=0; dirx=0;
startx++; startx++;
} }
cpty+=diry; cpty+=diry;
if(diry>0) bgy++; if(diry>0)
if(diry<0) bgy--; bgy++;
else if(diry<0)
bgy--;
if((bgy>-1) || (bgy<-63)) if((bgy>-1) || (bgy<-63))
bgy=-32; bgy=-32;
@ -235,7 +232,7 @@ float sinnonameno=0, oldsinnonameno=0;
diry=0; diry=0;
starty--; starty--;
} }
if(cpty==-32){ else if(cpty==-32) {
cpty=0; cpty=0;
if(((Map1Info[9+starty][10+startx]==1) || (Map1Info[9+starty][11+startx]==1)) || ((Map1Info[9+starty][10+startx]==43521) || (Map1Info[9+starty][11+startx]==43521))) { if(((Map1Info[9+starty][10+startx]==1) || (Map1Info[9+starty][11+startx]==1)) || ((Map1Info[9+starty][10+startx]==43521) || (Map1Info[9+starty][11+startx]==43521))) {
diry=0; diry=0;
@ -262,9 +259,13 @@ float sinnonameno=0, oldsinnonameno=0;
GRRLIB_Render(); GRRLIB_Render();
} }
GRRLIB_Exit(); GRRLIB_Exit();
// Free some textures
GRRLIB_FreeTexture(tex_tile1);
GRRLIB_FreeTexture(tex_perso);
GRRLIB_FreeTexture(tex_bg);
GRRLIB_FreeTexture(tex_nonameno);
exit(0); exit(0);
} }