Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/PixelWars

.gitignore

@@ -4,3 +4,4 @@ behaviors/*.dll
 behaviors/*.so
 generators/*.dll
 generators/*.so
+behaviors/.fuse*

src/dude.cpp

@@ -10,10 +10,13 @@ Dude::Dude(const Coord &_pos, Map *_map, int &_team) :
     m_success(true),
     m_inventory(EMPTY)
 {
+    m_action.dir = NO_DIR;
+    m_action.type = Action::WAIT;
+    m_action.com_data = Com();
     std::memset(&m_memory, 0, DUDE_MEMORY_SIZE);
     m_under = p_map->getPixel(m_pos).type;
-    if(PixelProperty::isResource(m_under))
+    //if(PixelProperty::isResource(m_under))
-        m_underResCount = p_map->getPixel(m_pos).data.nbRes;
+    //    m_underResCount = p_map->getPixel(m_pos).data.nbRes;
     p_map->getPixel(m_pos).type = DUDE;
     p_map->getPixel(m_pos).data.dudePtr = this;
 }
@@ -21,15 +24,15 @@ Dude::Dude(const Coord &_pos, Map *_map, int &_team) :
 void Dude::move(Dir d)
 {
     p_map->getPixel(m_pos).type = m_under;
-    if(PixelProperty::isResource(m_under))
+    //if(PixelProperty::isResource(m_under))
-        p_map->getPixel(m_pos).data.nbRes = m_underResCount;
+    //    p_map->getPixel(m_pos).data.nbRes = m_underResCount;
     p_map->getPixel(m_pos).data.dudePtr = NULL;
     
     m_pos += Coord(d);
     
     m_under = p_map->getPixel(m_pos).type;
-    if(PixelProperty::isResource(m_under))
+    //if(PixelProperty::isResource(m_under))
-        m_underResCount = p_map->getPixel(m_pos).data.nbRes;
+    //    m_underResCount = p_map->getPixel(m_pos).data.nbRes;
     p_map->getPixel(m_pos).type = DUDE;
     p_map->getPixel(m_pos).data.dudePtr = this;
     p_map->toreillerLoop(m_pos);

src/mainwindow.cpp

@@ -12,6 +12,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     p_simu(NULL),
+    m_simSpeed(0),
     m_simSpeedChanged(false),
     m_paused(false)
 {

src/map.cpp

@@ -20,5 +20,5 @@ Map::~Map()
 {
     delete[] m_map;
     if(m_nbTeams)
-        delete m_teams;
+        delete[] m_teams;
 }