Changeset e6c26b8 in network-game for common

Timestamp:

Oct 1, 2013, 8:08:24 PM (11 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

95ffe57

Parents:

373089e

Message:

The client dynamically allocates memory for players and passes around a map with player pointers and some includes are now in individual files instead of in Common.h

Location:

common

Files:

• Common.h (modified) (1 diff)
• MessageContainer.h (modified) (1 diff)
• MessageProcessor.cpp (modified) (1 diff)
• Player.cpp (modified) (1 diff)
• Player.h (modified) (2 diffs)
• Projectile.cpp (modified) (2 diffs)
• Projectile.h (modified) (1 diff)

common/Common.h

@@ -1 +1 @@
 #ifndef _COMMON_H
 #define _COMMON_H
-
-#include "Compiler.h"
-
-#if defined WINDOWS
-   #include <winsock2.h>
-   #include <ws2tcpip.h>
-#elif defined LINUX
-   #include <fcntl.h>
-   #include <assert.h>
-#endif
 
 #include <string>

common/MessageContainer.h

@@ -4 +4 @@
 #include <string>
 
-#include "Common.h"
+#include "Compiler.h"
 
-#if defined LINUX
+#if defined WINDOWS
+   #include <winsock2.h>
+#elif defined LINUX
    #include <netinet/in.h>
 #endif

common/MessageProcessor.cpp

@@ -3 +3 @@
 #include <iostream>
 #include <fstream>
+
+#include "Compiler.h"
+
+#if defined WINDOWS
+   #include <ws2tcpip.h>
+#endif
+
+#include "Common.h"
 
 MessageProcessor::MessageProcessor() {

common/Player.cpp

@@ -206 +206 @@
 }
 
-bool Player::updateTarget(map<unsigned int, Player>& mapPlayers) {
+bool Player::updateTarget(map<unsigned int, Player*>& mapPlayers) {
    if (this->isChasing) {
-      this->target.x = mapPlayers[this->targetPlayer].pos.x;
-      this->target.y = mapPlayers[this->targetPlayer].pos.y;
+      this->target.x = mapPlayers[this->targetPlayer]->pos.x;
+      this->target.y = mapPlayers[this->targetPlayer]->pos.y;
 
       if (posDistance(this->pos, this->target.toFloat()) <= this->range) {

common/Player.h

@@ -5 +5 @@
 #include <map>
 
-#include "Common.h"
+#include "Compiler.h"
 
-#if defined LINUX
+#if defined WINDOWS
+   #include <winsock2.h>
+#elif defined LINUX
    #include <netinet/in.h>
 #endif
@@ -46 +48 @@
    void deserialize(char* buffer);
 
-   bool updateTarget(map<unsigned int, Player>& mapPlayers);
+   bool updateTarget(map<unsigned int, Player*>& mapPlayers);
    bool move(WorldMap *map);
 

common/Projectile.cpp

@@ -71 +71 @@
 }
 
-bool Projectile::move(map<unsigned int, Player>& mapPlayers) {
+bool Projectile::move(map<unsigned int, Player*>& mapPlayers) {
    // if the current target logs off, this method will run into problems
 
    unsigned long long curTime = getCurrentMillis();
 
-   Player targetP = mapPlayers[target];
+   Player* targetP = mapPlayers[target];
 
    if (timeLastUpdated == 0) {
@@ -85 +85 @@
 
    float pixels = speed * (curTime-timeLastUpdated) / 1000.0;
-   double angle = atan2(targetP.pos.y-pos.y, targetP.pos.x-pos.x);
-   float dist = sqrt(pow(targetP.pos.x-pos.x, 2) + pow(targetP.pos.y-pos.y, 2));
+   double angle = atan2(targetP->pos.y-pos.y, targetP->pos.x-pos.x);
+   float dist = sqrt(pow(targetP->pos.x-pos.x, 2) + pow(targetP->pos.y-pos.y, 2));
 
    if (dist <= pixels) {
-      pos.x = targetP.pos.x;
-      pos.y = targetP.pos.y;
+      pos.x = targetP->pos.x;
+      pos.y = targetP->pos.y;
       return true;
    }else {

common/Projectile.h

@@ -26 +26 @@
 
    // returns true if it reached the target and should be deleted
-   bool move(map<unsigned int, Player>& mapPlayers);
+   bool move(map<unsigned int, Player*>& mapPlayers);
+
+   /*
+    * target should become a Player*. When this object gets serialized, the player's id should be sent.
+    * Deserialization in this case might be tricky since it will require a playerMap to turn the id into a Plauyer*
+    */
 
    int id;