summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Appert <dappert>2010-12-11 14:45:09 +0000
committerDamien Appert <dappert>2010-12-11 14:45:09 +0000
commitbc65b519f8a06758ffdbd305e2f7d90d800992a1 (patch)
tree09c7a4a275edd99b4d3ff7210bdf06a1a68c354a
parent57ed3585ebf8393230bf633cf2f249fa9b91a1bf (diff)
download2010-netlemmings-bc65b519f8a06758ffdbd305e2f7d90d800992a1.tar.gz
2010-netlemmings-bc65b519f8a06758ffdbd305e2f7d90d800992a1.tar.bz2
2010-netlemmings-bc65b519f8a06758ffdbd305e2f7d90d800992a1.zip
bon j'ai regardé le code :p
git-svn-id: file:///var/svn/2010-netlemmings/trunk@191 077b3477-7977-48bd-8428-443f22f7bfda
-rwxr-xr-xscripts/compil.sh6
-rw-r--r--src/graphic.c13
2 files changed, 3 insertions, 16 deletions
diff --git a/scripts/compil.sh b/scripts/compil.sh
index c88428d..d0d9265 100755
--- a/scripts/compil.sh
+++ b/scripts/compil.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
-cd ../bin
-cmake ../
-make
+
+( cd ../src/parser && make )
+( cd ../bin && cmake ../ && make )
if [ $# -gt 0 ]
then case $1 in
diff --git a/src/graphic.c b/src/graphic.c
index 05a12cd..c12b399 100644
--- a/src/graphic.c
+++ b/src/graphic.c
@@ -86,7 +86,6 @@ int pxAreaColor (SDL_Surface* s, Uint32 p , int x , int y , int mX , int mY ){
int paintTerrain(gameIni_t *gIni, gameRess_t *gRess, gameGraphics_t *gGraph) {
int res, i, modifier;
- int l,k;
int x,y,xmin,xmax,ymin,ymax,y2,xdst,ydst;
Uint32 dstPixel, dstStencil;
SDL_Surface *tile;
@@ -179,18 +178,6 @@ int paintTerrain(gameIni_t *gIni, gameRess_t *gRess, gameGraphics_t *gGraph) {
pxAreaColor (gGraph->surfaces.terrain,dstPixel,xdst,ydst,2,2);
pxAreaColor (gGraph->surfaces.stencil,dstStencil,xdst,ydst,2,2);
- /*
- //FIXME : optimiser le nombre d'appels ici !
- putPixel(gGraph->surfaces.terrain, xdst, ydst, dstPixel);
- putPixel(gGraph->surfaces.terrain, xdst+1, ydst, dstPixel);
- putPixel(gGraph->surfaces.terrain, xdst, ydst+1, dstPixel);
- putPixel(gGraph->surfaces.terrain, xdst+1, ydst+1, dstPixel);
-
- putPixel(gGraph->surfaces.stencil, xdst, ydst, dstStencil);
- putPixel(gGraph->surfaces.stencil, xdst+1, ydst, dstStencil);
- putPixel(gGraph->surfaces.stencil, xdst, ydst+1, dstStencil);
- putPixel(gGraph->surfaces.stencil, xdst+1, ydst+1, dstStencil);
- */
}
}