Changeset b07eeac in network-game for common/Common.h

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

File:

• common/Common.h (modified) (2 diffs)

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