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

fixed a few bugs

Browse Source
This commit is contained in:
Anselme 2017-02-26 16:18:06 +01:00
parent bb470ad518
commit cad7cc19a2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dude.cpp
View File

@ -8,8 +8,10 @@ Dude::Dude(const Coord &_pos, Map *_map, const int &_team) :
m_team(_team), m_team(_team),
m_dead(false), m_dead(false),
m_success(true), m_success(true),
m_receivedComData(false),
m_inventory(EMPTY) m_inventory(EMPTY)
{ {
memset(m_com_data.data, 0, COM_SIZE);
m_action.dir = NO_DIR; m_action.dir = NO_DIR;
m_action.type = Action::WAIT; m_action.type = Action::WAIT;
m_action.com_data = Com(); m_action.com_data = Com();

2
src/simulation.cpp
View File

@ -220,7 +220,7 @@ void Simulation::handleAction(Dude *dude)
Dude *targetDude = target.data.dudePtr; Dude *targetDude = target.data.dudePtr;
// TODO check conflicts between writers // TODO check conflicts between writers
if(targetDude->getCom() == nullptr){ if(targetDude->getCom() == nullptr){
targetDude->receiveComData(Dir((action.dir+2)%4), targetDude->getAction().com_data.data); targetDude->receiveComData(Dir((action.dir+2)%4), dude->getAction().com_data.data);
dude->setSuccess(true); dude->setSuccess(true);
}else }else
dude->setSuccess(false); dude->setSuccess(false);