Changeset b07eeac in network-game for common

Timestamp:

May 25, 2013, 1:45:54 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

2df63d6

Parents:

b81cea1

Message:

Players pick up flags when they get close to the flag objects, not the structres. When a flag is picked up, a REMOVE_OBJECT message is sent

Location:

common

Files:

• Common.cpp (modified) (3 diffs)
• Common.h (modified) (2 diffs)
• Message.cpp (modified) (1 diff)

common/Common.cpp

@@ -2 +2 @@
 
 #include <iostream>
-using namespace std;
+#include <cmath>
 
 #if defined WINDOWS
@@ -9 +9 @@
    #include <time.h>
 #endif
+
+using namespace std;
+
+/*
+FLOAT_POSITION POSITION::toFloat() {
+   FLOAT_POSITION floatPosition;
+   floatPosition.x = x;
+   floatPosition.y = y;
+
+   return floatPosition;
+}
+*/
 
 void set_nonblock(int sock)
@@ -38 +50 @@
    return numMilliseconds;
 }
+
+float posDistance(FLOAT_POSITION pos1, FLOAT_POSITION pos2) {
+   float xDiff = pos2.x - pos1.x;
+   float yDiff = pos2.y - pos1.y;
+
+   return sqrt( pow(xDiff,2) + pow(yDiff,2) );   
+}

common/Common.h

@@ -12 +12 @@
 #endif
 
-void set_nonblock(int sock);
-unsigned long long getCurrentMillis();
-
-typedef struct
-{
-   int x;
-   int y;
-} POSITION;
-
 typedef struct
 {
@@ -27 +18 @@
 } FLOAT_POSITION;
 
+typedef struct
+{
+   int x;
+   int y;
+   //FLOAT_POSITION toFloat();
+   FLOAT_POSITION toFloat() {
+      FLOAT_POSITION floatPosition;
+      floatPosition.x = x;
+      floatPosition.y = y;
+
+      return floatPosition;
+   }
+} POSITION;
+
+void set_nonblock(int sock);
+unsigned long long getCurrentMillis();
+float posDistance(FLOAT_POSITION pos1, FLOAT_POSITION pos2);
+
 #endif

common/Message.cpp

@@ -19 +19 @@
    int ret =  sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
 
+   cout << "Send a message of type " << msg->type << endl;
+
    return ret;
 }