Changes in client/Client/main.cpp [384b7e0:3a79253] in network-game

File:

• client/Client/main.cpp (modified) (18 diffs)

client/Client/main.cpp

@@ -14 +14 @@
 
 #include <sys/types.h>
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string>
 #include <iostream>
-#include <sstream>
 
 #include <map>
@@ -25 +24 @@
 #include <allegro5/allegro_font.h>
 #include <allegro5/allegro_ttf.h>
-#include <allegro5/allegro_primitives.h>
 
 #include "../../common/Message.h"
 #include "../../common/Common.h"
-#include "../../common/WorldMap.h"
 #include "../../common/Player.h"
 
@@ -45 +42 @@
 void initWinSock();
 void shutdownWinSock();
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map<unsigned int, Player>& mapPlayers, unsigned int& curPlayerId);
-void drawMap(WorldMap* gameMap);
-void drawPlayers(map<unsigned int, Player>& mapPlayers, unsigned int curPlayerId);
-POSITION screenToMap(POSITION pos);
-POSITION mapToScreen(POSITION pos);
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole);
 
 // callbacks
@@ -80 +73 @@
 bool doexit;
 
+map<unsigned int, Player> mapPlayers;
+
 Window* wndLogin;
 Window* wndMain;
@@ -104 +99 @@
    bool redraw = true;
    doexit = false;
-   map<unsigned int, Player> mapPlayers;
-   unsigned int curPlayerId = -1;
 
    float bouncer_x = SCREEN_W / 2.0 - BOUNCER_SIZE / 2.0;
@@ -117 +110 @@
    }
 
-   if (al_init_primitives_addon())
-      cout << "Primitives initialized" << endl;
-   else
-      cout << "Primitives not initialized" << endl;
-
+   al_init_primitives_addon();
    al_init_font_addon();
    al_init_ttf_addon();
 
-   #if defined WINDOWS
-      ALLEGRO_FONT *font = al_load_ttf_font("../pirulen.ttf", 12, 0);
-   #elif defined LINUX
-      ALLEGRO_FONT *font = al_load_ttf_font("pirulen.ttf", 12, 0);
-   #endif
-
+   ALLEGRO_FONT *font = al_load_ttf_font("../pirulen.ttf", 12, 0);
+ 
    if (!font) {
       fprintf(stderr, "Could not load 'pirulen.ttf'.\n");
@@ -159 +144 @@
       return -1;
    }
-
-   WorldMap* gameMap = WorldMap::loadMapFromFile("../../data/map.txt");
-   //delete gameMap;
-   //gameMap = WorldMap::createDefaultMap();
 
    wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H);
@@ -310 +291 @@
          }
       }
-      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 (receiveMessage(&msgFrom, sock, &from) >= 0)
       {
-         processMessage(msgFrom, state, chatConsole, mapPlayers, curPlayerId);
+         processMessage(msgFrom, state, chatConsole);
          cout << "state: " << state << endl;
       }
@@ -341 +301 @@
       {
          redraw = false;
-
+ 
          wndCurrent->draw(display);
+ 
+         al_draw_bitmap(bouncer, bouncer_x, bouncer_y, 0);
 
          chatConsole.draw(font, al_map_rgb(255,255,255));
@@ -352 +314 @@
          else if(wndCurrent == wndMain) {
             al_draw_text(font, al_map_rgb(0, 255, 0), 4, 43, ALLEGRO_ALIGN_LEFT, "Message:");
-
-            drawMap(gameMap);
-            drawPlayers(mapPlayers, curPlayerId);
          }
 
@@ -371 +330 @@
    delete wndLogin;
    delete wndMain;
-
-   delete gameMap;
 
    al_destroy_event_queue(event_queue);
@@ -415 +372 @@
 }
 
-POSITION screenToMap(POSITION pos)
-{
-   pos.x = pos.x-300;
-   pos.y = pos.y-100;
-
-   if (pos.x < 0 || pos.y < 0)
-   {
-      pos.x = -1;
-      pos.y = -1;
-   }
-
-   return pos;
-}
-
-POSITION mapToScreen(POSITION pos)
-{
-   pos.x = pos.x+300;
-   pos.y = pos.y+100;
-
-   return pos;
-}
-
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map<unsigned int, Player>& mapPlayers, unsigned int& curPlayerId)
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole)
 {
    string response = string(msg.buffer);
@@ -448 +383 @@
       {
          cout << "In STATE_START" << endl;
+
+         chatConsole.addLine(response);
 
          switch(msg.type)
@@ -471 +408 @@
                   state = STATE_LOGIN;
                   wndCurrent = wndMain;
-                  
-                  Player p("", "");
-                  p.deserialize(msg.buffer);
-                  mapPlayers[p.id] = p;
-                  curPlayerId = p.id;
-
-                  cout << "Got a valid login response with the player" << endl;
-                  cout << "Player id: " << curPlayerId << endl; 
+                  cout << "User login successful" << endl;
                }
-
                break;
             }
@@ -489 +418 @@
       case STATE_LOGIN:
       {
-         switch(msg.type)
+         chatConsole.addLine(response);
+
+          switch(msg.type)
          {
             case MSG_TYPE_REGISTER:
@@ -497 +428 @@
             case MSG_TYPE_LOGIN:
             {
-               chatConsole.addLine(response);
-
                if (response.compare("You have successfully logged out.") == 0)
                {
@@ -518 +447 @@
                mapPlayers[p.id] = p;
 
-               cout << "Received MSG_TYPE_PLAYER message" << endl;
+               cout << "p.id: " << p.id << endl;
+               cout << "p.name: " << p.name << endl;
+               cout << "p.pos.x: " << p.pos.x << endl;
+               cout << "p.pos.y: " << p.pos.y << endl;
 
                break;
             }
-            case MSG_TYPE_CHAT:
-            {
-               chatConsole.addLine(response);
-
-               break;
-            }
-         }
-
+         }
+                     
          break;
       }
@@ -541 +467 @@
 }
 
-void drawMap(WorldMap* gameMap)
-{
-   POSITION mapPos;
-   mapPos.x = 0;
-   mapPos.y = 0;
-   mapPos = mapToScreen(mapPos);
-   for (int x=0; x<12; x++)
-   {
-      for (int y=0; y<12; y++)
-      {
-         WorldMap::TerrainType el = gameMap->getElement(x, y);
-
-         if (el == WorldMap::TERRAIN_GRASS)
-            al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(0, 255, 0));
-         else if (el == WorldMap::TERRAIN_OCEAN)
-            al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(0, 0, 255));
-         else if (el == WorldMap::TERRAIN_ROCK)
-            al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(100, 100, 0));
-      }
-   }
-}
-
-void drawPlayers(map<unsigned int, Player>& mapPlayers, unsigned int curPlayerId)
-{
-   map<unsigned int, Player>::iterator it;
-
-   Player* p;
-   POSITION pos;
-
-   for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
-   {
-      p = &it->second;
-      pos = mapToScreen(p->pos);
-
-      if (p->id == curPlayerId)
-         al_draw_filled_circle(pos.x, pos.y, 12, al_map_rgb(255, 0, 0));
-      else
-         al_draw_filled_circle(pos.x, pos.y, 12, al_map_rgb(191, 0, 0));
-   }
-}
-
 void registerAccount()
 {