Changeset a1a3bd5 in network-game

Timestamp:

Apr 23, 2013, 1:31:54 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

227baaa

Parents:

054b50b

Message:

Made client changes for smooth player movement, changed the player move method to check the map for obstacles and return a bool indicating success or failure.

Files:

• client/Client/main.cpp (modified) (11 diffs)
• common/Player.cpp (modified) (1 diff)
• common/Player.h (modified) (2 diffs)
• common/WorldMap.cpp (modified) (5 diffs)
• common/WorldMap.h (modified) (2 diffs)
• data/map.txt (modified) (1 diff)

client/Client/main.cpp

@@ -75 +75 @@
 bool doexit;
 
-map<unsigned int, Player> mapPlayers;
-
 Window* wndLogin;
 Window* wndMain;
@@ -226 +224 @@
       }
       else if(ev.type == ALLEGRO_EVENT_TIMER) {
-         redraw = true;
+         redraw = true; // seems like we should just call a draw function here instead
       }
       else if(ev.type == ALLEGRO_EVENT_DISPLAY_CLOSE) {
          doexit = true;
+
+         // perform a check to see if it's time to send an update to the server
+         // need to store num ticks since the lst update for this
+         // also check how often each update actually happens and how much it deviates from 60 times per second
       }
       else if(ev.type == ALLEGRO_EVENT_KEY_DOWN) {
@@ -264 +266 @@
       if (receiveMessage(&msgFrom, sock, &from) >= 0)
          processMessage(msgFrom, state, chatConsole, mapPlayers, curPlayerId);
- 
-      // update player positions
-      map<unsigned int, Player>::iterator it;
-      for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
-      {
-         it->second.move();
-      }
-
-      if (redraw && al_is_event_queue_empty(event_queue))
+
+      if (redraw)
       {
          redraw = false;
@@ -286 +281 @@
          else if(wndCurrent == wndMain) {
             al_draw_text(font, al_map_rgb(0, 255, 0), 4, 43, ALLEGRO_ALIGN_LEFT, "Message:");
+
+            // update player positions
+            map<unsigned int, Player>::iterator it;
+            for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+            {
+               it->second.move();   // ignore return value
+            }
 
             drawMap(gameMap);
@@ -382 +384 @@
 {
    string response = string(msg.buffer);
+
+   cout << "Processing message" << endl;
+   cout << response << endl;
 
    switch(state)
@@ -419 +424 @@
                   cout << "Got a valid login response with the player" << endl;
                   cout << "Player id: " << curPlayerId << endl; 
+                  cout << "map size: " << mapPlayers.size() << endl;
                }
+
+               break;
+            }
+            case MSG_TYPE_PLAYER:   // kind of hacky to put this here
+            {
+               cout << "Got MSG_TYPE_PLAYER message in Start" << endl;
+
+               Player p("", "");
+               p.deserialize(msg.buffer);
+               p.timeLastUpdated = getCurrentMillis();
+               mapPlayers[p.id] = p;
+
+               cout << "new player id: " << p.id << endl;
+               cout << "map size: " << mapPlayers.size() << endl;
 
                break;
@@ -437 +457 @@
             case MSG_TYPE_LOGIN:
             {
+               cout << "Got a login message" << endl;
+               
                chatConsole.addLine(response);
-
+               cout << "Added new line" << endl;
+
+               break;
+            }
+            case MSG_TYPE_LOGOUT:
+            {
                cout << "Got a logout message" << endl;
+
                if (response.compare("You have successfully logged out.") == 0)
                {
@@ -446 +474 @@
                   wndCurrent = wndLogin;
                }
-               else
-               {
-                  cout << "Added new line" << endl;
-               }
-
-               break;
-            }
-            case MSG_TYPE_LOGOUT:
-            {
-               cout << "Got a logout message, but we don't process it" << endl;
 
                break;
@@ -461 +479 @@
             case MSG_TYPE_PLAYER:
             {
+               cout << "Got MSG_TYPE_PLAYER message in Login" << endl;
+
                Player p("", "");
                p.deserialize(msg.buffer);
                p.timeLastUpdated = getCurrentMillis();
                mapPlayers[p.id] = p;
+
+               break;
+            }
+            case MSG_TYPE_PLAYER_MOVE:
+            {
+               cout << "Got a player move message" << endl;
+
+               unsigned int id;
+               int x, y;
+
+               memcpy(&id, msg.buffer, 4);
+               memcpy(&x, msg.buffer+4, 4);
+               memcpy(&y, msg.buffer+8, 4);
+
+               mapPlayers[id].target.x = x;
+               mapPlayers[id].target.y = y;
 
                break;
@@ -498 +534 @@
       {
          WorldMap::TerrainType el = gameMap->getElement(x, y);
+         WorldMap::ObjectType obj = gameMap->getObject(x, y);
 
          if (el == WorldMap::TERRAIN_GRASS)
@@ -505 +542 @@
          else if (el == WorldMap::TERRAIN_ROCK)
             al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(100, 100, 0));
+
+         if (obj == WorldMap::OBJECT_RED_FLAG)
+            al_draw_filled_rectangle(x*25+5+mapPos.x, y*25+5+mapPos.y, x*25+20+mapPos.x, y*25+20+mapPos.y, al_map_rgb(255, 0, 0));
+         else if (obj == WorldMap::OBJECT_BLUE_FLAG)
+            al_draw_filled_rectangle(x*25+5+mapPos.x, y*25+5+mapPos.y, x*25+20+mapPos.x, y*25+20+mapPos.y, al_map_rgb(0, 0, 255));
       }
    }

common/Player.cpp

@@ -83 +83 @@
 }
 
-void Player::move(void) {
+bool Player::move(WorldMap map) {
    int speed = 100; // pixels per second
    unsigned long long curTime = getCurrentMillis();
+   bool moveCanceled = false;
 
    // if we're at our target, don't move
    if (pos.x != target.x || pos.y != target.y) {
       float pixels = speed * (curTime-timeLastUpdated) / 1000.0;
+      double angle = atan2(target.y-pos.y, target.x-pos.x);
+      float dist = sqrt(pow(target.x-pos.x, 2) + pow(target.y-pos.y, 2));
+      POSITION newPos;
 
-      double angle = atan2(target.y-pos.y, target.x-pos.x);
-
-      float dist = sqrt(pow(target.x-pos.x, 2) + pow(target.y-pos.y, 2));
       if (dist <= pixels) {
          pos.x = target.x;
          pos.y = target.y;
       }else {
-         pos.x += cos(angle)*pixels;
-         pos.y += sin(angle)*pixels;
+         newPos.x = int(pos.x + cos(angle)*pixels);
+         newPos.y = int(pos.y + sin(angle)*pixels);
+
+         switch(map.getElement(newPos.x/25, newPos.y/25)) {
+            case WorldMap.TerrainType.TERRAIN_OCEAN:
+            case WorldMap.TerrainType.TERRAIN_ROCK:
+               target.x = pos.x;
+               target.y = pos.y;
+               moveCanceled = true;
+               break;
+         }
       }
    }
 
    timeLastUpdated = curTime;
+   return !moveCanceled;
 }

common/Player.h

@@ -14 +14 @@
 
 #include "Common.h"
+#include "WorldMap.h"
 
 using namespace std;
@@ -32 +33 @@
    void setAddr(sockaddr_in addr);
 
-   void move();
+   bool move(WorldMap map);
 
    int id;

common/WorldMap.cpp

@@ -15 +15 @@
 
    vctMap = new vector<vector<TerrainType>*>(width);
+   vctObjects = new vector<vector<ObjectType>*>(width);
 
    for (int x=0; x<width; x++) {
-      vector<TerrainType>* newVector = new vector<TerrainType>(height);
+      vector<TerrainType>* newMapVector = new vector<TerrainType>(height);
+      vector<ObjectType>* newObjectVector = new vector<ObjectType>(height);
 
-      for (int y=0; y<height; y++)
-         (*newVector)[y] = TERRAIN_NONE;
+      for (int y=0; y<height; y++) {
+         (*newMapVector)[y] = TERRAIN_NONE;
+         (*newObjectVector)[y] = OBJECT_NONE;
+      }
 
-      (*vctMap)[x] = newVector;
+      (*vctMap)[x] = newMapVector;
+      (*vctObjects)[x] = newObjectVector;
    }
 }
@@ -28 +33 @@
 WorldMap::~WorldMap()
 {
-   for (int x=0; x<width; x++)
+   for (int x=0; x<width; x++) {
       delete (*vctMap)[x];
+      delete (*vctObjects)[x];
+   }
 
    delete vctMap;
+   delete vctObjects;
 }
 
@@ -43 +51 @@
    cout << "getting element" << endl;
    (*(*vctMap)[x])[y] = t;
+}
+
+WorldMap::ObjectType WorldMap::getObject(int x, int y)
+{
+   return (*(*vctObjects)[x])[y];
+}
+
+void WorldMap::setObject(int x, int y, ObjectType t)
+{
+   cout << "getting object" << endl;
+   (*(*vctObjects)[x])[y] = t;
 }
 
@@ -57 +76 @@
          else
             m->setElement(x, y, TERRAIN_GRASS);
+
+         m->setObject(x, y, OBJECT_NONE);
       }
    }
@@ -102 +123 @@
             istringstream iss(line);
             string token;
-            int type;
-            TerrainType terrain;
 
-            for(int x=0; x<width; x++)
-            {
+            if (row < height) {
+               // load terrain
+
+               int type;
+               TerrainType terrain;
+
+               for(int x=0; x<width; x++)
+               {
+                  getline(iss, token, ',');
+                  cout << "token: " << token << endl;
+                  type = atoi(token.c_str());
+                  cout << "type: " << type << endl;
+
+                  switch(type) {
+                  case 1:
+                     terrain = TERRAIN_GRASS;
+                     break;
+                  case 2:
+                     terrain = TERRAIN_OCEAN;
+                     break;
+                  case 3:
+                     terrain = TERRAIN_ROCK;
+                     break;
+                  }
+
+                  cout << "About to set element" << endl;
+                  cout << "x: " << x << endl;
+                  cout << "row: " << row << endl;
+                  m->setElement(x, row, terrain);
+               }
+            }else {
+               // load objects
+
+               int x, y, type;
+               ObjectType object;
+
                getline(iss, token, ',');
-               cout << "token: " << token << endl;
+               cout << "token(x): " << token << endl;
+               x = atoi(token.c_str());
+
+               getline(iss, token, ',');
+               cout << "token(y): " << token << endl;
+               y = atoi(token.c_str());
+
+               getline(iss, token, ',');
+               cout << "token(type): " << token << endl;
                type = atoi(token.c_str());
-               cout << "type: " << type << endl;
 
                switch(type) {
+               case 0:
+                  object = OBJECT_NONE;
+                  break;
                case 1:
-                  terrain = TERRAIN_GRASS;
+                  object = OBJECT_RED_FLAG;
                   break;
                case 2:
-                  terrain = TERRAIN_OCEAN;
-                  break;
-               case 3:
-                  terrain = TERRAIN_ROCK;
+                  object = OBJECT_BLUE_FLAG;
                   break;
                }
 
-               cout << "About to set element" << endl;
-               cout << "x: " << x << endl;
-               cout << "row: " << row << endl;
-               m->setElement(x, row, terrain);
+               m->setObject(x, y, object);
             }
          }

common/WorldMap.h

@@ -17 +17 @@
    };
 
+   enum ObjectType {
+      OBJECT_NONE,
+      OBJECT_RED_FLAG,
+      OBJECT_BLUE_FLAG
+   };
+
    int width, height;
    vector<vector<TerrainType>*>* vctMap;
+   vector<vector<ObjectType>*>* vctObjects;
 
    WorldMap(int width, int height);
@@ -27 +34 @@
    void setElement(int x, int y, TerrainType type);
 
+   ObjectType getObject(int x, int y);
+   void setObject(int x, int y, ObjectType type);
+
    static WorldMap* createDefaultMap();
    static WorldMap* loadMapFromFile(string filename);

data/map.txt

@@ -12 +12 @@
 2,1,1,1,1,1,1,1,1,1,1,2
 2,2,2,2,2,2,2,2,2,2,2,2
+6,1,1
+6,10,2