EpicSparrow/PixelWars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bad initialization of variable

Browse Source
This commit is contained in:
Lendemor 2016-06-02 20:33:43 +02:00
parent 7ccce4b6d1
commit 2312e78b55
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

15
src/dude.cpp
View File

@ -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);

1
src/mainwindow.cpp
View File

@ -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)
{

2
src/map.cpp
View File

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