Undo some changes

git-svn-id: https://wii-tac-toe.googlecode.com/svn/tags/0.6@43 bba1cac1-252d-79fd-420d-80adb1f9fa09

Author: Crayon2000

Makefile

@@ -15,7 +15,7 @@ include $(DEVKITPPC)/wii_rules
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	Wii-Tac-Toe
+TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source source/grrlib source/libpng/pngu
 DATA		:=	data

Wii-Tac-Toe/meta.xml

@@ -3,7 +3,7 @@
     <name>Wii-Tac-Toe</name>
     <coder>Crayon</coder>
     <version>0.6</version>
-    <release_date>200906010000</release_date>
+    <release_date>200906120000</release_date>
     <short_description>Tic-Tac-Toe game</short_description> 
     <long_description>Wii-Tac-Toe is a Tic-Tac-Toe game for the Nintendo Wii. It was programmed in C++ using devkitPro along with GRRLIB.
 

source/game.cpp

@@ -231,13 +231,13 @@ void Game::GameScreen(bool CopyScreen)
 
         // Draw grid content
         Symbol *Sign = new Symbol;
-        u8 x, y;
-        for(x = 0; x < 3; x++)
+        for(int x = 0; x < 3; x++)
         {
-            for(y = 0; y < 3; y++)
+            for(int y = 0; y < 3; y++)
             {
                 Sign->SetPlayer(GameGrid->GetPlayerAtPos(x, y));
-                Sign->SetLocation(Table[x][y].GetX(), Table[x][y].GetY());
+                Sign->SetLeft(Table[x][y].GetX());
+                Sign->SetTop(Table[x][y].GetY());
                 Sign->Paint();
             }
         }

source/game.h

@@ -8,7 +8,6 @@
 #include "cursor.h"
 #include "player.h"
 #include "language.h"
-#include "types.h"
 
 #define TEXT_SIZE 100
 
@@ -78,5 +77,48 @@ class Game
     u8 AIThinkLoop;
     gameMode GameMode;
 };
+
+/**
+ * Class used to defines a pixel location onscreen.
+ * @author Crayon
+ */
+class Point
+{
+private:
+    u16 x, y;
+public:
+    /**
+     * Constructor for the Point class.
+     */
+    Point(u16 x, u16 y)
+    {
+        this->x = x;
+        this->y = y;
+    }
+    /**
+     * Get the x position.
+     */
+    u16 GetX()
+    {
+        return x;
+    }
+    /**
+     * Get the y position.
+     */
+    u16 GetY()
+    {
+        return y;
+    }
+    /**
+     * Set the new position.
+     * @param[in] x Specifies the x-coordinate.
+     * @param[in] y Specifies the y-coordinate.
+     */
+    void setLocation(u16 x, u16 y)
+    {
+        this->x = x;
+        this->y = y;
+    }
+};
 //---------------------------------------------------------------------------
 #endif

source/grid.cpp

@@ -73,12 +73,11 @@ bool Grid::SetPlayer(u8 Player, u8 X, u8 Y)
 void Grid::SetPlayerAI(u8 Player)
 {
     u8 TestBoard[3][3];
-    u8 x, y;
 
     // Test win
-    for(x = 0; x < 3; x++)
+    for(int x = 0; x < 3; x++)
     {
-        for(y = 0; y < 3; y++)
+        for(int y = 0; y < 3; y++)
         {
             memcpy(TestBoard, Board, sizeof(TestBoard));
             if(TestBoard[x][y] == ' ')
@@ -95,9 +94,9 @@ void Grid::SetPlayerAI(u8 Player)
 
     // Test block
     u8 Opponent = (Player == 'X') ? 'O' : 'X';
-    for(x = 0; x < 3; x++)
+    for(int x = 0; x < 3; x++)
     {
-        for(y = 0; y < 3; y++)
+        for(int y = 0; y < 3; y++)
         {
             memcpy(TestBoard, Board, sizeof(TestBoard));
             if(TestBoard[x][y] == ' ')
@@ -145,9 +144,24 @@ u8 Grid::GetPlayerAtPos(u8 X, u8 Y)
  */
 void Grid::Clear()
 {
-    memset(Board, ' ', sizeof(Board));
+    for(int x = 0; x < 3; x++)
+    {
+        for(int y = 0; y < 3; y++)
+        {
+            Board[x][y] = ' ';
+        }
+    }
 }
 
+/**
+ * Return the complete grid.
+ */
+/*
+u8[][] Grid::GetGrid()
+{
+    return Board;
+}
+*/
 /**
  * Return the winner.
  * @return Winning player.
@@ -223,10 +237,9 @@ bool Grid::IsPlayerWinning(u8 Player)
  */
 bool Grid::IsFilled()
 {
-    u8 x, y;
-    for(x = 0; x < 3; x++)
+    for(int x = 0; x < 3; x++)
     {
-        for(y = 0; y < 3; y++)
+        for(int y = 0; y < 3; y++)
         {
             if(Board[x][y] == ' ')
                 return false;

source/grid.h

@@ -20,6 +20,7 @@ class Grid
     void SetPlayerRandom(u8);
     void SetPlayerAI(u8);
     u8 GetPlayerAtPos(u8, u8);
+    //u8[][] GetGrid();
     u8 GetWinner();
     void Clear();
     bool IsFilled();

source/object.cpp

@@ -59,19 +59,6 @@ void Object::SetTop(float Top)
     this->Top = Top;
 }
 
-/**
- * Set the left and top position of the object.
- * @param[in] Left Left in pixel.
- * @param[in] Top Top in pixel.
- * @see SetLeft()
- * @see SetTop()
- */
-void Object::SetLocation(float Left, float Top)
-{
-    this->Left = Left;
-    this->Top = Top;
-}
-
 /**
  * Get the width of the object.
  * @see SetWidth()
@@ -145,6 +132,13 @@ void Object::SetVisible(bool Visible)
     this->Visible = Visible;
 }
 
+/**
+ * Draw an image on screen.
+ */
+void Object::Paint()
+{
+}
+
 /**
  * Check if a position is inside the object.
  * @param[in] x X position in pixel.

source/object.h

@@ -24,7 +24,6 @@ class Object
     bool IsVisible();
     void SetLeft(float);
     void SetTop(float);
-    void SetLocation(float, float);
     void SetWidth(unsigned int);
     void SetHeight(unsigned int);
     void SetSize(unsigned int, unsigned int);
@@ -33,7 +32,7 @@ class Object
     void SetVisible(bool);
     bool IsInside(float, float);
 protected:
-    virtual void Paint() = 0; /**< Draw an image on screen. */
+    virtual void Paint();
 
     float Left;         /**< Specifies the x-coordinate of the upper-left corner of the object. */
     float Top;          /**< Specifies the y-coordinate of the upper-left corner of the object. */

source/symbol.cpp

@@ -10,7 +10,7 @@
  */
 Symbol::Symbol() : Object()
 {
-    Player = 'X';
+    this->Player = 'X';
 
     ImgO = GRRLIB_LoadTexture(o);
     ImgX = GRRLIB_LoadTexture(x);
@@ -45,9 +45,9 @@ void Symbol::Paint()
 
 /**
  * Set the current player to draw on the screen.
- * @param[in] APlayer Player sign, either X or O.
+ * @param[in] Player Player sign, either X or O.
  */
-void Symbol::SetPlayer(unsigned char APlayer)
+void Symbol::SetPlayer(unsigned char Player)
 {
-    Player = APlayer;
+    this->Player = Player;
 }