Changeset 0693e25 in network-game for common/Common.h

Timestamp:

Sep 28, 2013, 2:11:19 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

6319311

Parents:

3ef8cf4

Message:

The client draws the map and players in individual games

File:

• common/Common.h (modified) (1 diff)

common/Common.h

@@ -16 +16 @@
 using namespace std;
 
-typedef struct
-{
+struct FLOAT_POSITION;
+
+struct POSITION {
+   int x;
+   int y;
+   FLOAT_POSITION toFloat();
+};
+
+struct FLOAT_POSITION {
    float x;
    float y;
-} FLOAT_POSITION;
-
-typedef struct
-{
-   int x;
-   int y;
-   FLOAT_POSITION toFloat() {
-      FLOAT_POSITION floatPosition;
-      floatPosition.x = x;
-      floatPosition.y = y;
-
-      return floatPosition;
-   }
-} POSITION;
+   POSITION toInt();
+};
 
 void set_nonblock(int sock);
 unsigned long long getCurrentMillis();
 string getCurrentDateTimeString();
+
+POSITION screenToMap(POSITION pos);
+POSITION mapToScreen(POSITION pos);
 float posDistance(FLOAT_POSITION pos1, FLOAT_POSITION pos2);