From 0962b98e6188dcd747d886c1d02cf1b4e8fd8d47 Mon Sep 17 00:00:00 2001 From: pierreyoda Date: Sun, 27 Jun 2010 15:48:38 +0000 Subject: [PATCH] SNAPSHOT OF 0.7 RELEASE - Added icon to the launcher executable --- O2R_Launcher/O2R_Launcher.pro | 1 + O2R_Launcher/icon.ico | Bin 0 -> 67646 bytes O2R_Launcher/resources.rc | 1 + src/Cat.cpp | 2 +- src/Game.cpp | 3 ++- 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 O2R_Launcher/icon.ico create mode 100644 O2R_Launcher/resources.rc diff --git a/O2R_Launcher/O2R_Launcher.pro b/O2R_Launcher/O2R_Launcher.pro index 8358bcb..b5406e6 100644 --- 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 new file mode 100644 index 0000000000000000000000000000000000000000..23104e475587e0e11b64d7fdd250922625333333 GIT binary patch literal 67646 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 literal 0 HcmV?d00001 diff --git a/O2R_Launcher/resources.rc b/O2R_Launcher/resources.rc new file mode 100644 index 0000000..86e8e9b --- /dev/null +++ b/O2R_Launcher/resources.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "icon.ico" diff --git a/src/Cat.cpp b/src/Cat.cpp index 5e7a9f1..5b3b5fc 100644 --- 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 index 1b83123..8dd1f34 100644 --- 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"));