Changeset 49da01a in network-game

Timestamp:

Jul 22, 2013, 11:52:39 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

dee75cc

Parents:

365e156

Message:

Add status messages for login and registration and remove the Message class (MessageProcessor includes all that functionality now)

Files:

• client/Client/Client.vcxproj (modified) (2 diffs)
• client/Client/Client.vcxproj.filters (modified) (2 diffs)
• client/Client/RadioButtonList.cpp (modified) (1 diff)
• client/Client/RadioButtonList.h (modified) (1 diff)
• client/Client/main.cpp (modified) (4 diffs)
• common/Message.cpp (deleted)
• common/Message.h (deleted)
• common/MessageProcessor.h (modified) (1 diff)

client/Client/Client.vcxproj

@@ -71 +71 @@
     <ClCompile Include="..\..\common\Projectile.cpp" />
     <ClCompile Include="..\..\common\WorldMap.cpp" />
-    <ClCompile Include="..\..\common\Message.cpp" />
     <ClCompile Include="..\..\common\Player.cpp" />
     <ClCompile Include="chat.cpp" />
@@ -88 +87 @@
     <ClInclude Include="..\..\common\Projectile.h" />
     <ClInclude Include="..\..\common\WorldMap.h" />
-    <ClInclude Include="..\..\common\Message.h" />
     <ClInclude Include="..\..\common\Player.h" />
     <ClInclude Include="chat.h" />

client/Client/Client.vcxproj.filters

@@ -43 +43 @@
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\common\Message.cpp">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
     <ClCompile Include="Window.cpp">
       <Filter>Source Files\gui</Filter>
@@ -87 +84 @@
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\Message.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Common.h">
       <Filter>Header Files\common</Filter>

client/Client/RadioButtonList.cpp

@@ -65 +65 @@
    return this->selectedButton;
 }
+
+void RadioButtonList::setSelectedButton(int b) {
+   this->selectedButton = b;
+}

client/Client/RadioButtonList.h

@@ -26 +26 @@
    void addRadioButton(string s);
    int getSelectedButton();
+   void setSelectedButton(int b);
 };
 

client/Client/main.cpp

@@ -232 +232 @@
    cout << "Created main screen" << endl;
 
-   wndCurrent = wndLogin;
+   goToLoginScreen();
  
    event_queue = al_create_event_queue();
@@ -398 +398 @@
          chatConsole.draw(font, al_map_rgb(255,255,255));
 
-         // There should be label gui components that show these or each textbox should have a label
-         if(wndCurrent == wndLogin || wndCurrent == wndRegister) {
-            //al_draw_text(font, al_map_rgb(0, 255, 0), 416, 43, ALLEGRO_ALIGN_LEFT, "Username:");
-            //al_draw_text(font, al_map_rgb(0, 255, 0), 413, 73, ALLEGRO_ALIGN_LEFT, "Password:");
-         }
-         else if(wndCurrent == wndMain) {
+         if(wndCurrent == wndMain) {
             al_draw_text(font, al_map_rgb(0, 255, 0), 4, 43, ALLEGRO_ALIGN_LEFT, "Message:");
 
@@ -645 +640 @@
                   cout << "Logged out" << endl;
                   state = STATE_START;
-                  wndCurrent = wndLogin;
+                  goToLoginScreen();
                }
 
@@ -914 +909 @@
 void goToRegisterScreen()
 {
-   wndCurrent = wndRegister;
-
    txtUsernameRegister->clear();
    txtPasswordRegister->clear();
+   lblRegisterStatus->setText("");
+   rblClasses->setSelectedButton(-1);
+
+   wndCurrent = wndRegister;
 }
 
 void goToLoginScreen()
 {
-   wndCurrent = wndLogin;
-
    txtUsername->clear();
    txtPassword->clear();
+   lblLoginStatus->setText("");
+
+   wndCurrent = wndLogin;
 }
 

common/MessageProcessor.h

@@ -15 +15 @@
 #endif
 
-/*
-#define MSG_TYPE_REGISTER          1
-#define MSG_TYPE_LOGIN             2
-#define MSG_TYPE_LOGOUT            3
-#define MSG_TYPE_CHAT              4
-#define MSG_TYPE_PLAYER            5  // server sends this to update player positions
-#define MSG_TYPE_PLAYER_MOVE       6  // client sends this when a player wants to move
-#define MSG_TYPE_OBJECT            7
-#define MSG_TYPE_REMOVE_OBJECT     8
-#define MSG_TYPE_PICKUP_FLAG       9
-#define MSG_TYPE_DROP_FLAG         10
-#define MSG_TYPE_SCORE             11
-#define MSG_TYPE_START_ATTACK      12
-#define MSG_TYPE_ATTACK            13
-#define MSG_TYPE_PROJECTILE        14
-#define MSG_TYPE_REMOVE_PROJECTILE 15
+#define MSG_TYPE_ACK               1
+#define MSG_TYPE_REGISTER          2
+#define MSG_TYPE_LOGIN             3
+#define MSG_TYPE_LOGOUT            4
+#define MSG_TYPE_CHAT              5
+#define MSG_TYPE_PLAYER            6  // server sends this to update player positions
+#define MSG_TYPE_PLAYER_MOVE       7  // client sends this when a player wants to move
+#define MSG_TYPE_OBJECT            8
+#define MSG_TYPE_REMOVE_OBJECT     9
+#define MSG_TYPE_PICKUP_FLAG       10
+#define MSG_TYPE_DROP_FLAG         11
+#define MSG_TYPE_SCORE             12
+#define MSG_TYPE_START_ATTACK      13
+#define MSG_TYPE_ATTACK            14
+#define MSG_TYPE_PROJECTILE        15
+#define MSG_TYPE_REMOVE_PROJECTILE 16
 
 typedef struct
 {
-   short type;
+   unsigned int id;
+   unsigned short type;
    char buffer[256];
 } NETWORK_MSG;
-*/
 
 using namespace std;