From 2312e78b557e3bbf3465aaf8f556f84f8d4cca04 Mon Sep 17 00:00:00 2001 From: Lendemor Date: Thu, 2 Jun 2016 20:33:43 +0200 Subject: [PATCH] fixed bad initialization of variable --- .gitignore | 1 + src/dude.cpp | 15 +++++++++------ src/mainwindow.cpp | 1 + src/map.cpp | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9d3b129..9de854c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ behaviors/*.dll behaviors/*.so generators/*.dll generators/*.so +behaviors/.fuse* diff --git a/src/dude.cpp b/src/dude.cpp index 7bc0b4c..0f2c853 100644 --- a/src/dude.cpp +++ b/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)) - m_underResCount = p_map->getPixel(m_pos).data.nbRes; + //if(PixelProperty::isResource(m_under)) + // 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)) - p_map->getPixel(m_pos).data.nbRes = m_underResCount; + //if(PixelProperty::isResource(m_under)) + // 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)) - m_underResCount = p_map->getPixel(m_pos).data.nbRes; + //if(PixelProperty::isResource(m_under)) + // 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); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5d97d15..6ee6090 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -11,6 +11,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), p_simu(NULL), + m_simSpeed(0), m_simSpeedChanged(false), m_paused(false) { diff --git a/src/map.cpp b/src/map.cpp index ededf23..e9d0d5b 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -20,5 +20,5 @@ Map::~Map() { delete[] m_map; if(m_nbTeams) - delete m_teams; + delete[] m_teams; }