Changeset 53643ca in network-game for common/Game.cpp

Timestamp:

Jul 19, 2014, 12:32:33 AM (10 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

4c00935

Parents:

cdb0e98

Message:

Server loads user profile and game history info from the database, saves game history to the db after every game, and uses a lua settings file to load db settings

File:

• common/Game.cpp (modified) (15 diffs)

common/Game.cpp

@@ -217 +217 @@
    p->takeDamage(damage);
 
-   if (p->isDead)
-   {
+   if (p->isDead) {
       ObjectType flagType = OBJECT_NONE;
       if (p->hasBlueFlag)
@@ -240 +239 @@
    bool gameFinished = false;
 
-   for (it = this->getPlayers().begin(); it != this->getPlayers().end(); it++)
-   {
-      gameFinished = gameFinished ||
-         this->handlePlayerEvents(it->second);
+   for (it = this->getPlayers().begin(); it != this->getPlayers().end(); it++) {
+      gameFinished = gameFinished || this->handlePlayerEvents(it->second);
    }
 
    if (gameFinished) {
-      for (it = this->players.begin(); it != this->players.end(); it++)
-      {
+      for (it = this->players.begin(); it != this->players.end(); it++) {
          it->second->currentGame = NULL;
       }
@@ -279 +275 @@
       bool ownFlagAtBase = false;
 
-      switch(this->worldMap->getStructure(p->pos.x/25, p->pos.y/25))
-      {
+      switch(this->worldMap->getStructure(p->pos.x/25, p->pos.y/25)) {
          case STRUCTURE_BLUE_FLAG:
          {
-            if (p->team == 0 && p->hasRedFlag)
-            {
+            if (p->team == 0 && p->hasRedFlag) {
                // check that your flag is at your base
                pos = this->worldMap->getStructureLocation(STRUCTURE_BLUE_FLAG);
@@ -291 +285 @@
                vector<WorldMap::Object>::iterator itObjects;
 
-               for (itObjects = vctObjects->begin(); itObjects != vctObjects->end(); itObjects++)
-               {
-                  if (itObjects->type == OBJECT_BLUE_FLAG)
-                  {
-                     if (itObjects->pos.x == pos.x*25+12 && itObjects->pos.y == pos.y*25+12)
-                     {
+               for (itObjects = vctObjects->begin(); itObjects != vctObjects->end(); itObjects++) {
+                  if (itObjects->type == OBJECT_BLUE_FLAG) {
+                     if (itObjects->pos.x == pos.x*25+12 && itObjects->pos.y == pos.y*25+12) {
                         ownFlagAtBase = true;
                         break;
@@ -303 +294 @@
                }
 
-               if (ownFlagAtBase)
-               {
+               if (ownFlagAtBase) {
                   p->hasRedFlag = false;
                   flagType = OBJECT_RED_FLAG;
@@ -317 +307 @@
          case STRUCTURE_RED_FLAG:
          {
-            if (p->team == 1 && p->hasBlueFlag)
-            {
+            if (p->team == 1 && p->hasBlueFlag) {
                // check that your flag is at your base
                pos = this->worldMap->getStructureLocation(STRUCTURE_RED_FLAG);
@@ -325 +314 @@
                vector<WorldMap::Object>::iterator itObjects;
 
-               for (itObjects = vctObjects->begin(); itObjects != vctObjects->end(); itObjects++)
-               {
-                  if (itObjects->type == OBJECT_RED_FLAG)
-                  {
-                     if (itObjects->pos.x == pos.x*25+12 && itObjects->pos.y == pos.y*25+12)
-                     {
+               for (itObjects = vctObjects->begin(); itObjects != vctObjects->end(); itObjects++) {
+                  if (itObjects->type == OBJECT_RED_FLAG) {
+                     if (itObjects->pos.x == pos.x*25+12 && itObjects->pos.y == pos.y*25+12) {
                         ownFlagAtBase = true;
                         break;
@@ -337 +323 @@
                }
 
-               if (ownFlagAtBase)
-               {
+               if (ownFlagAtBase) {
                   p->hasBlueFlag = false;
                   flagType = OBJECT_BLUE_FLAG;
@@ -355 +340 @@
       }
 
-      if (flagTurnedIn)
-      {
+      if (flagTurnedIn) {
          unsigned int blueScore = this->blueScore;
          unsigned int redScore = this->redScore;
@@ -399 +383 @@
       POSITION structPos;
 
-      for (itObjects = vctObjects->begin(); itObjects != vctObjects->end(); itObjects++)
-      {
+      for (itObjects = vctObjects->begin(); itObjects != vctObjects->end(); itObjects++) {
          POSITION pos = itObjects->pos;
 
-         if (posDistance(p->pos, pos.toFloat()) < 10)
-         {
-            if (p->team == 0 && 
-                itObjects->type == OBJECT_BLUE_FLAG)
-            {
+         if (posDistance(p->pos, pos.toFloat()) < 10) {
+            if (p->team == 0 && itObjects->type == OBJECT_BLUE_FLAG) {
                structPos = this->worldMap->getStructureLocation(STRUCTURE_BLUE_FLAG);
                flagReturned = true;
                break;
-            }
-            else if (p->team == 1 &&
-                     itObjects->type == OBJECT_RED_FLAG)
-            {
+            } else if (p->team == 1 && itObjects->type == OBJECT_RED_FLAG) {
                structPos = this->worldMap->getStructureLocation(STRUCTURE_RED_FLAG);
                flagReturned = true;
@@ -422 +399 @@
       }
 
-      if (flagReturned)
-      {
+      if (flagReturned) {
          itObjects->pos.x = structPos.x*25+12;
          itObjects->pos.y = structPos.y*25+12;
@@ -432 +408 @@
       }
 
-      if (broadcastMove)
-      {
+      if (broadcastMove) {
          serverMsg.type = MSG_TYPE_PLAYER;
          p->serialize(serverMsg.buffer);
@@ -443 +418 @@
 
    // check if the player's attack animation is complete
-   if (p->isAttacking && p->timeAttackStarted+p->attackCooldown <= getCurrentMillis())
-   {
+   if (p->isAttacking && p->timeAttackStarted+p->attackCooldown <= getCurrentMillis()) {
       p->isAttacking = false;
       cout << "Attack animation is complete" << endl;
@@ -451 +425 @@
       cout << "about to broadcast attack" << endl;
 
-      if (p->attackType == Player::ATTACK_MELEE)
-      {
+      if (p->attackType == Player::ATTACK_MELEE) {
          cout << "Melee attack" << endl;
 
          Player* target = players[p->getTargetPlayer()];
          this->dealDamageToPlayer(target, p->damage);
-      }
-      else if (p->attackType == Player::ATTACK_RANGED)
-      {
+      } else if (p->attackType == Player::ATTACK_RANGED) {
          cout << "Ranged attack" << endl;
 
@@ -476 +447 @@
          memcpy(serverMsg.buffer+12, &targetId, 4);
          msgProcessor->broadcastMessage(serverMsg, players);
-      }
-      else
+      } else
          cout << "Invalid attack type: " << p->attackType << endl;
    }