Skip to content

Commit

Permalink
Bugfixing stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@saantiaguilera
saantiaguilera committed Jul 3, 2016
1 parent 31c464e commit 40bba22
Show file tree
Hide file tree
Showing 12 changed files with 312 additions and 79 deletions.
2 changes: 2 additions & 0 deletions client/controller/concurrent/client_ReceiverThread.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ class ReceiverThread : public Thread {

json += buffer;

std::cout << "Received: id: " << messageCode << " message: " << json << std::endl;

switch (messageCode) {
//Do something
case NEW_PLAYER:
Expand Down
2 changes: 2 additions & 0 deletions client/controller/concurrent/client_SenderThread.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class SenderThread : public Thread {
socket->send((char*) &length, sizeof(length));

socket->send((char*) serializer->getSerialized().c_str(), serializer->getMessageLength());

std::cout << "Data sent: " << serializer->getSerialized() << std::endl;
}

virtual void run() {
Expand Down
177 changes: 151 additions & 26 deletions json/bosschamber2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Bombman",
"filename": "bosschamber2.json",
"height": 600,
"width": 1100,
"width": 1050,
"id": 7,
"background_image": "res/drawable/background/background1.png",
"obstacles": [
Expand Down Expand Up @@ -37,11 +37,6 @@
"y": 625,
"type": 2
},
{
"x": 1125,
"y": 625,
"type": 2
},
{
"x": 1025,
"y": 625,
Expand Down Expand Up @@ -132,11 +127,6 @@
"y": 325,
"type": 2
},
{
"x": 1125,
"y": 325,
"type": 2
},
{
"x": 675,
"y": 475,
Expand Down Expand Up @@ -273,53 +263,188 @@
"type": 2
},
{
"x": 1125,
"y": 275,
"x": 1075,
"y": 325,
"type": 2
},
{
"x": 1125,
"y": 375,
"x": 1075,
"y": 475,
"type": 2
},
{
"x": 1125,
"y": 425,
"x": 1025,
"y": 475,
"type": 2
},
{
"x": 1125,
"y": 475,
"x": 525,
"y": 575,
"type": 2
},
{
"x": 1125,
"x": 475,
"y": 525,
"type": 2
},
{
"x": 1125,
"x": 425,
"y": 575,
"type": 2
},
{
"x": 1075,
"y": 475,
"x": 475,
"y": 575,
"type": 2
},
{
"x": 1025,
"y": 475,
"x": 525,
"y": 525,
"type": 2
},
{
"x": 625,
"y": 575,
"type": 2
},
{
"x": 575,
"y": 575,
"type": 2
},
{
"x": 675,
"y": 575,
"type": 2
},
{
"x": 725,
"y": 575,
"type": 2
},
{
"x": 775,
"y": 575,
"type": 2
},
{
"x": 825,
"y": 525,
"type": 2
},
{
"x": 875,
"y": 575,
"type": 2
},
{
"x": 825,
"y": 575,
"type": 2
},
{
"x": 975,
"y": 475,
"type": 2
},
{
"x": 1075,
"y": 425,
"type": 2
},
{
"x": 1075,
"y": 375,
"type": 2
},
{
"x": 1075,
"y": 525,
"type": 2
},
{
"x": 1075,
"y": 575,
"type": 2
},
{
"x": 275,
"y": 325,
"type": 2
},
{
"x": 325,
"y": 325,
"type": 2
},
{
"x": 375,
"y": 475,
"y": 325,
"type": 2
},
{
"x": 425,
"y": 325,
"type": 2
},
{
"x": 475,
"y": 325,
"type": 2
},
{
"x": 525,
"y": 325,
"type": 2
},
{
"x": 575,
"y": 325,
"type": 2
},
{
"x": 675,
"y": 325,
"type": 2
},
{
"x": 725,
"y": 325,
"type": 2
},
{
"x": 625,
"y": 325,
"type": 2
},
{
"x": 775,
"y": 325,
"type": 2
},
{
"x": 875,
"y": 325,
"type": 2
},
{
"x": 925,
"y": 325,
"type": 2
},
{
"x": 975,
"y": 325,
"type": 2
},
{
"x": 1025,
"y": 325,
"type": 2
},
{
"x": 825,
"y": 325,
"type": 2
}
]
Expand Down
Loading

0 comments on commit 40bba22

Please sign in to comment.