SNAPSHOT OF 0.7 RELEASE

- Added icon to the launcher executable
pierreyoda · Jun 27, 2010 · 0962b98 · 0962b98
1 parent 006bf5f
commit 0962b98
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/O2R_Launcher/O2R_Launcher.pro b/O2R_Launcher/O2R_Launcher.pro
@@ -15,3 +15,4 @@ FORMS += MainWindow.ui \
     AboutDialog.ui
 RESOURCES += resources.qrc
 TRANSLATIONS += dataprivate/o2r-gui_fr.ts
+RC_FILE = resources.rc
diff --git a/O2R_Launcher/icon.ico b/O2R_Launcher/icon.ico
diff --git a/O2R_Launcher/resources.rc b/O2R_Launcher/resources.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "icon.ico"
diff --git a/src/Cat.cpp b/src/Cat.cpp
@@ -40,7 +40,7 @@ bool Cat::moveCat(Level &lvl, const sf::Vector2i &mousePos,
     {
         if (!m_astarAlreadyMoved || (mousePos != prevMousepos || infos.hasChanged))
         {
-            path = *AStarAlgorithm::pathfinding(m_pos, mousePos, lvl);
+            path l= *AStarAlgorithm::pathfinding(m_pos, mousePos, lvl);
             prevMousepos = mousePos;
             m_astarAlreadyMoved = true;
         }

diff --git a/src/Game.cpp b/src/Game.cpp
@@ -121,7 +121,8 @@ void Game::updateCats(const bool &astar)
         Cat &cat = *iter;
         if (cat.isAlive())
         {
-            if (cat.moveCat(*currentLevel.get(), mouse.pos(), cats, astar) && !mouse.dead())
+            if (cat.moveCat(*currentLevel.get(), mouse.pos(), cats, astar) &&
+                    !mouse.dead())
                 mouse.die();
             if (cat.cannotMoveNb() > 0)
                 cat.setImage(gImageManager.getResource("cat_awaiting.png"));