Changeset e1f78f5 in network-game

Timestamp:

May 26, 2013, 8:57:11 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

4b4b153

Parents:

46fa35a

Message:

START_ATTACK and ATTACK message types have been added and the client sends a START_ATTACK message when the user right-clicks on an enemy player

Files:

• client/Client/main.cpp (modified) (3 diffs)
• common/Message.h (modified) (1 diff)

client/Client/main.cpp

@@ -254 +254 @@
                   for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
                   {
-                     &it->second;
                      if (it->second.id == curPlayerId)
                         p = &it->second;
@@ -279 +278 @@
       else if(ev.type == ALLEGRO_EVENT_MOUSE_BUTTON_UP) {
          if(wndCurrent == wndMain) {
-            msgTo.type = MSG_TYPE_PLAYER_MOVE;
-
-            POSITION pos;
-            pos.x = ev.mouse.x;
-            pos.y = ev.mouse.y;
-            pos = screenToMap(pos);
-
-            if (pos.x != -1)
-            {
-               memcpy(msgTo.buffer, &curPlayerId, 4);
-               memcpy(msgTo.buffer+4, &pos.x, 4);
-               memcpy(msgTo.buffer+8, &pos.y, 4);
-
-               sendMessage(&msgTo, sock, &server);
-            }
-            else
-               cout << "Invalid point: User did not click on the map" << endl;
+            if (ev.mouse.button == 1) {   // left click
+               msgTo.type = MSG_TYPE_PLAYER_MOVE;
+
+               POSITION pos;
+               pos.x = ev.mouse.x;
+               pos.y = ev.mouse.y;
+               pos = screenToMap(pos);
+
+               if (pos.x != -1)
+               {
+                  memcpy(msgTo.buffer, &curPlayerId, 4);
+                  memcpy(msgTo.buffer+4, &pos.x, 4);
+                  memcpy(msgTo.buffer+8, &pos.y, 4);
+
+                  sendMessage(&msgTo, sock, &server);
+               }
+               else
+                  cout << "Invalid point: User did not click on the map" << endl;
+            }else if (ev.mouse.button == 2) {   // right click
+                  map<unsigned int, Player>::iterator it;
+
+                  Player* curPlayer;
+                  for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+                  {
+                     if (it->second.id == curPlayerId)
+                        curPlayer = &it->second;
+                  }
+
+                  Player* target;
+                  for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+                  {
+                     target = &it->second;
+                     if (target->id != curPlayerId && target->team != curPlayer->team) {
+                        msgTo.type = MSG_TYPE_START_ATTACK;
+                        memcpy(msgTo.buffer, &curPlayerId, 4);
+                        memcpy(msgTo.buffer+4, &target->id, 4);
+
+                        sendMessage(&msgTo, sock, &server);
+                     }
+                  }
+            }
          }
       }
@@ -710 +733 @@
       al_draw_filled_rectangle(pos.x-12, pos.y-24, pos.x+12, pos.y-16, al_map_rgb(0, 0, 0));
       if (it->second.maxHealth != 0)
-         al_draw_filled_rectangle(pos.x-11, pos.y-19, pos.x-11+(22*it->second.health)/it->second.maxHealth, pos.y-15, al_map_rgb(255, 0, 0));
+         al_draw_filled_rectangle(pos.x-11, pos.y-23, pos.x-11+(22*it->second.health)/it->second.maxHealth, pos.y-17, al_map_rgb(255, 0, 0));
 
       if (p->hasBlueFlag)

common/Message.h

@@ -13 +13 @@
 #define MSG_TYPE_DROP_FLAG     10
 #define MSG_TYPE_SCORE         11
+#define MSG_TYPE_START_ATTACK  12
+#define MSG_TYPE_ATTACK        13
 
 typedef struct