Changeset 6475138 in network-game for client/Client

Timestamp:

Nov 25, 2012, 1:13:45 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

2488852

Parents:

9a3e6b1

Message:

Added a chat class to encapsulate the server messages and text input

Location:

client/Client

Files:

• Client.vcxproj (modified) (2 diffs)
• Client.vcxproj.filters (modified) (2 diffs)
• chat.cpp (added)
• chat.h (added)
• main.cpp (modified) (5 diffs)

client/Client/Client.vcxproj

@@ -65 +65 @@
   <ItemGroup>
     <ClCompile Include="..\..\common\message.cpp" />
+    <ClCompile Include="chat.cpp" />
     <ClCompile Include="main.cpp" />
   </ItemGroup>
@@ -70 +71 @@
     <ClInclude Include="..\..\common\compiler.h" />
     <ClInclude Include="..\..\common\message.h" />
+    <ClInclude Include="chat.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

client/Client/Client.vcxproj.filters

@@ -17 +17 @@
       <UniqueIdentifier>{9ecfb491-9e8e-4a29-bc07-dd887204d590}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\common">
+      <UniqueIdentifier>{6c9ad2f2-bc8d-4e25-9c5c-c4440c60991c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -25 +28 @@
       <Filter>Source Files\common</Filter>
     </ClCompile>
+    <ClCompile Include="chat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\common\message.h">
-      <Filter>Source Files\common</Filter>
+    <ClInclude Include="chat.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\common\compiler.h">
-      <Filter>Source Files\common</Filter>
+      <Filter>Header Files\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\common\message.h">
+      <Filter>Header Files\common</Filter>
     </ClInclude>
   </ItemGroup>

client/Client/main.cpp

@@ -26 +26 @@
 #include "../../common/message.h"
 
+#include "chat.h"
+
 #ifdef WINDOWS
-        #pragma comment(lib, "ws2_32.lib")
+   #pragma comment(lib, "ws2_32.lib")
 #endif
 
@@ -56 +58 @@
    bool doexit = false;
 
-   vector<string> vctChat;
-   string strPrompt;
-   string strEnteredInput;
+   chat chatConsole;
 
    if(!al_init()) {
@@ -161 +161 @@
       error("receiveMessage");
         
-   vctChat.push_back(string(msgFrom.buffer));
+   chatConsole.addLine(msgFrom.buffer);
 
    al_start_timer(timer);
@@ -193 +193 @@
       }
       else if(ev.type == ALLEGRO_EVENT_KEY_DOWN) {
-         switch(ev.keyboard.keycode) {
-            case ALLEGRO_KEY_UP:
-               key[KEY_UP] = true;
-               break;
- 
-            case ALLEGRO_KEY_DOWN:
-               key[KEY_DOWN] = true;
-               break;
- 
-            case ALLEGRO_KEY_LEFT: 
-               key[KEY_LEFT] = true;
-               break;
- 
-            case ALLEGRO_KEY_RIGHT:
-               key[KEY_RIGHT] = true;
-               break;
-
-                        case ALLEGRO_KEY_ENTER:
-                           strEnteredInput = strPrompt;
-                           strPrompt.clear();
-
-                           if (strEnteredInput.compare("q") == 0) {
-                              doexit = true;
-                       }
-                           else
-                           {
-                  strcpy(msgTo.buffer, strEnteredInput.c_str());
-                          n=sendMessage(&msgTo, sock, &server);
-                          if (n < 0)
-                                 error("sendMessage");
-
-                          n = receiveMessage(&msgFrom, sock, &from);
-                          if (n < 0)
-                                 error("receiveMessage");
-
-                          vctChat.push_back(string(msgFrom.buffer));
-                           }
-
-                           break;
-         }
-
-                 if(ALLEGRO_KEY_A <= ev.keyboard.keycode && ev.keyboard.keycode <= ALLEGRO_KEY_Z)
-                 {
-            char newChar = 'a'+ev.keyboard.keycode-ALLEGRO_KEY_A;
-            strPrompt.append(1, newChar);
-                 }
-
-                 if(ALLEGRO_KEY_0 <= ev.keyboard.keycode && ev.keyboard.keycode <= ALLEGRO_KEY_9)
-                 {
-            char newChar = '0'+ev.keyboard.keycode-ALLEGRO_KEY_0;
-            strPrompt.append(1, newChar);
-                 }
+         bool eventConsumed = chatConsole.processEvent(ev);
+
+         if (eventConsumed) {
+            string input = chatConsole.getInput();
+            if (!input.empty()) {
+               cout << "input: " << input << endl;
+               strcpy(msgTo.buffer, input.c_str());
+               
+               n=sendMessage(&msgTo, sock, &server);
+               if (n < 0)
+                  error("sendMessage");
+
+               n = receiveMessage(&msgFrom, sock, &from);
+               if (n < 0)
+                  error("receiveMessage");
+
+               chatConsole.addLine(string(msgFrom.buffer));
+               cout << "Added new line" << endl;
+            }
+         }else {
+            switch(ev.keyboard.keycode) {
+               case ALLEGRO_KEY_UP:
+                  key[KEY_UP] = true;
+                  break;
+ 
+               case ALLEGRO_KEY_DOWN:
+                  key[KEY_DOWN] = true;
+                  break;
+ 
+               case ALLEGRO_KEY_LEFT: 
+                  key[KEY_LEFT] = true;
+                  break;
+ 
+               case ALLEGRO_KEY_RIGHT:
+                  key[KEY_RIGHT] = true;
+                  break;
+            }
+         }
       }
       else if(ev.type == ALLEGRO_EVENT_KEY_UP) {
@@ -277 +263 @@
          al_draw_bitmap(bouncer, bouncer_x, bouncer_y, 0);
 
-                 for(int x=0; x<vctChat.size(); x++)
-            al_draw_text(font, al_map_rgb(255,255,255), 10, 10+x*15, ALLEGRO_ALIGN_LEFT, vctChat[x].c_str());
-
-                 al_draw_text(font, al_map_rgb(255,255,255), 10, 460, ALLEGRO_ALIGN_LEFT, strPrompt.c_str());
-         
+         chatConsole.draw(font, al_map_rgb(255,255,255));
+
          al_flip_display();
       }