Changeset ce2bb87 in network-game for common

Timestamp:

Dec 20, 2013, 3:42:30 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

b73bc28

Parents:

6c9bcdd

Message:

A player can pick up an opponent's flag in an individual game

Location:

common

Files:

• Game.cpp (modified) (2 diffs)
• Game.h (modified) (1 diff)

common/Game.cpp

@@ -1 +1 @@
 #include "Game.h"
+
+#include "Common.h"
 
 using namespace std;
@@ -112 +114 @@
 }
 
+// returns the id of the picked-up flag or -1 if none was picked up
+int Game::processFlagPickupRequest(Player* p) {
+   vector<WorldMap::Object>* vctObjects = this->worldMap->getObjects();
+   vector<WorldMap::Object>::iterator it;
+   int playerId = -1;
+
+   for (it = vctObjects->begin(); it != vctObjects->end(); it++) {
+      if (posDistance(p->pos, it->pos.toFloat()) < 10) {
+         switch (it->type) {
+            case WorldMap::OBJECT_BLUE_FLAG:
+               if (p->team == 1) {
+                  p->hasBlueFlag = true;
+                  playerId = it->id;
+               }
+               break;
+            case WorldMap::OBJECT_RED_FLAG:
+               if (p->team == 0) {
+                  p->hasRedFlag = true;
+                  playerId = it->id;
+               }
+               break;
+         }
+
+         if (playerId > -1) {
+            vctObjects->erase(it);
+            return playerId;
+         }
+      }
+   }
+
+   return playerId;
+}
+
 void Game::setRedScore(int score) {
    this->redScore = score;

common/Game.h

@@ -43 +43 @@
    bool startPlayerMovement(unsigned int id, int x, int y);
    bool processPlayerMovement(Player* p, FLOAT_POSITION oldPos);
+   int processFlagPickupRequest(Player* p);
 
    void setBlueScore(int score);