- [FIX] nom de musica incorrecte

- [FIX] Al carregar el mapa nomes contaba fins a x=10 en compte de 20.
- Aplicats els nous draw::draw()
- Fora tots els draw::setTrans(), el color transparent no canvia en tot el joc.

source/aux_font.cpp

@@ -32,7 +32,6 @@ namespace font
     void print(const int x, const int y, const std::string text)
     {
         draw::setSource(font::mode == font::type::colored ? font::font2 : font::font1);
-        draw::setTrans(0);
 
         if (font::mode == font::type::fade) for (int i=64;i<=67;++i) draw::swapcol(i, i+4);
 
@@ -47,8 +46,6 @@ namespace font
         }
 
         for (int i=64;i<=67;++i) draw::restorecol(i);
-
-        draw::setTrans(255);
     }
 
     void print(const int x, const int y, const int num)

source/gamestate_menu.cpp

@@ -41,13 +41,10 @@ namespace gamestate
             const int x = input::mouseX();
             const int y = input::mouseY();
 
-            draw::setTrans(255);
+            draw::draw(fondo);
-            draw::setSource(fondo);
-            draw::draw(0, 0, 320, 200, 0, 0);
 
-            draw::setTrans(0);
             draw::setSource(cursor);
-            draw::draw(x, y, cursor->w, cursor->h, 0, 0);
+            draw::draw(x, y);
 
             draw::render();
 

source/gamestate_play.cpp

@@ -10,6 +10,7 @@ namespace gamestate
     {
         draw::surface *fondo = nullptr;
         draw::surface *mapa = nullptr;
+        draw::surface *cursor = nullptr;
 
         uint32_t arounderCount;
         uint32_t startTicks;
@@ -30,7 +31,7 @@ namespace gamestate
             draw::setPalette(pal, 128);
 
             // [TODO] Carreagar la resta de gifs que facen falta
-            //cursor = drawManager->LoadFont("cursor.gif");
+            cursor = draw::loadSurface("cursor.gif");
             //menu = drawManager->LoadFont("menu.gif");
 
             // [TODO] CREAR AIGUA PROCESSOR
@@ -40,7 +41,7 @@ namespace gamestate
             mapa::arounders::eixits++;
             // arounder_seleccionat = primerArounders
 
-            audio::loadMusic((fase+1) % 5 == 0 ? "mus6.ogg" : "mus4.mp3");
+            audio::loadMusic((fase+1) % 5 == 0 ? "mus6.ogg" : "mus4.ogg");
             audio::playMusic();
 
             play::arounderCount = play::startTicks = game::getTicks();
@@ -52,18 +53,19 @@ namespace gamestate
         bool loop()
         {
             play::draw();
+
+            return true;
         }
 
         void draw()
         {
-            draw::setSource(play::fondo);
+            draw::draw(play::fondo);
-            draw::draw();
             
-            int accio = -1;
+            int accio = 0;
-            int prevista = -1;
+            int prevista = 0;
             // [TODO] if (arounders::seleccionat) { accio = arounders::seleccionat->accio; prevista = arounders::seleccionat->prevista; }
             // [QUESTION] Potser lo del seleccionat se deuria mirar dins de "mapa"?
-            mapa::pintar(0, 0); // [TODO] if (arounders::seleccionat) existeix, pillar la accio i la prevista de ell
+            mapa::pintar(accio, prevista); // [TODO] if (arounders::seleccionat) existeix, pillar la accio i la prevista de ell
 
             // [TODO] aigua::pintar();
             // [TODO] arounders::pintar();
@@ -75,6 +77,11 @@ namespace gamestate
                 draw::draw(arounderSeleccionat->X-3, arounderSeleccionat->Y-3);
             }
             */
+
+            draw::setSource(cursor);
+            draw::draw(input::mouseX(), input::mouseY());
+
+            draw::render();
         }
     }
 }

source/gamestate_prefase.cpp

@@ -48,13 +48,10 @@ namespace gamestate
         {
             static bool salir = false;
 
-            draw::setTrans(255);
+            draw::draw(fondo);
-            draw::setSource(fondo);
-            draw::draw(0, 0, 320, 200, 0, 0);
 
-            draw::setTrans(0);
             draw::setSource(cursor);
-            draw::draw(input::mouseX(), input::mouseY(), cursor->w, cursor->h, 0, 0);
+            draw::draw(input::mouseX(), input::mouseY());
 
             draw::render();
 

source/gamestate_sequence.cpp

@@ -16,7 +16,6 @@ namespace gamestate
 
         void init()
         {
-            draw::setTrans(255);
             font::selectFont(font::type::colored);
 
             std::string filename;
@@ -118,8 +117,7 @@ namespace gamestate
         void drawPic(std::string filename)
         {
             draw::surface *pic = draw::loadSurface(filename, true);
-            draw::setSource(pic);
+            draw::draw(pic);
-            draw::draw(0, 0, 320, 200, 0, 0);
             draw::freeSurface(pic);
         }
 

source/main.cpp

@@ -5,6 +5,8 @@
 void game::init()
 {
     draw::init("Arounders", 320, 200, 3);
+    draw::setTrans(0);
+
     input::init(3);
     audio::init();
     

source/proc_mapa.cpp

@@ -74,7 +74,7 @@ namespace mapa
 		draw::setDestination(mapa);
 
 		for (int y=0; y<10; ++y)
-			for (int x=0; x<10; ++x)
+			for (int x=0; x<20; ++x)
 			{
 				int tile = textfile::toInt(textfile::getNextToken());
 				if (tile > 0) draw::draw(x*16, y*16, 16, 16, (tile-1)*16, tileset*16);