Changeset 5c95436 in network-game

Timestamp:

Jun 21, 2013, 1:52:53 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

109e8a3

Parents:

5a5f131

Message:

Add a RadioButtonList gui control to the client, re-organize the login/registration screen into two separate screens, and allow the player to select their class during registration

Location:

client/Client

Files:

• Client.vcxproj (modified) (2 diffs)
• Client.vcxproj.filters (modified) (2 diffs)
• RadioButtonList.cpp (added)
• RadioButtonList.h (added)
• main.cpp (modified) (7 diffs)

client/Client/Client.vcxproj

@@ -73 +73 @@
     <ClCompile Include="GuiComponent.cpp" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="RadioButtonList.cpp" />
     <ClCompile Include="Textbox.cpp" />
     <ClCompile Include="Window.cpp" />
@@ -86 +87 @@
     <ClInclude Include="Button.h" />
     <ClInclude Include="GuiComponent.h" />
+    <ClInclude Include="RadioButtonList.h" />
     <ClInclude Include="Textbox.h" />
     <ClInclude Include="Window.h" />

client/Client/Client.vcxproj.filters

@@ -61 +61 @@
       <Filter>Source Files\common</Filter>
     </ClCompile>
+    <ClCompile Include="RadioButtonList.cpp">
+      <Filter>Source Files\gui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -96 +99 @@
       <Filter>Header Files\common</Filter>
     </ClInclude>
+    <ClInclude Include="RadioButtonList.h">
+      <Filter>Header Files\gui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>

client/Client/main.cpp

@@ -36 +36 @@
 #include "Textbox.h"
 #include "Button.h"
+#include "RadioButtonList.h"
 #include "chat.h"
 
@@ -53 +54 @@
 
 // callbacks
+void goToLoginScreen();
+void goToRegisterScreen();
 void registerAccount();
 void login();
@@ -75 +78 @@
 
 Window* wndLogin;
+Window* wndRegister;
 Window* wndMain;
 Window* wndCurrent;
 
+// wndLogin
 Textbox* txtUsername;
 Textbox* txtPassword;
+
+// wndRegister
+Textbox* txtUsernameRegister;
+Textbox* txtPasswordRegister;
+RadioButtonList* rblClasses;
+
+// wndMain
 Textbox* txtChat;
 
@@ -160 +172 @@
    wndLogin->addComponent(new Textbox(104, 40, 100, 20, font));
    wndLogin->addComponent(new Textbox(104, 70, 100, 20, font));
-   wndLogin->addComponent(new Button(22, 100, 90, 20, font, "Register", registerAccount));
+   wndLogin->addComponent(new Button(22, 100, 90, 20, font, "Create an Account", goToRegisterScreen));
    wndLogin->addComponent(new Button(122, 100, 60, 20, font, "Login", login));
    wndLogin->addComponent(new Button(540, 10, 80, 20, font, "Quit", quit));
@@ -166 +178 @@
    txtUsername = (Textbox*)wndLogin->getComponent(0);
    txtPassword = (Textbox*)wndLogin->getComponent(1);
+
+   wndRegister = new Window(0, 0, SCREEN_W, SCREEN_H);
+   wndRegister->addComponent(new Textbox(104, 40, 100, 20, font));
+   wndRegister->addComponent(new Textbox(104, 70, 100, 20, font));
+   wndRegister->addComponent(new Button(22, 100, 90, 20, font, "Back", goToLoginScreen));
+   wndRegister->addComponent(new Button(122, 100, 60, 20, font, "Submit", registerAccount));
+   wndRegister->addComponent(new Button(540, 10, 80, 20, font, "Quit", quit));
+   wndRegister->addComponent(new RadioButtonList(20, 130, "Pick a class", font));
+
+   txtUsernameRegister = (Textbox*)wndRegister->getComponent(0);
+   txtPasswordRegister = (Textbox*)wndRegister->getComponent(1);
+
+   rblClasses = (RadioButtonList*)wndRegister->getComponent(5);
+   rblClasses->addRadioButton("Warrior");
+   rblClasses->addRadioButton("Ranger");
 
    wndMain = new Window(0, 0, SCREEN_W, SCREEN_H);
@@ -833 +860 @@
 }
 
-void registerAccount()
-{
-   string username = txtUsername->getStr();
-   string password = txtPassword->getStr();
+void goToRegisterScreen()
+{
+   wndCurrent = wndRegister;
+
+   txtUsernameRegister->clear();
+   txtPasswordRegister->clear();
+}
+
+void goToLoginScreen()
+{
+   wndCurrent = wndLogin;
 
    txtUsername->clear();
    txtPassword->clear();
+}
+
+void registerAccount()
+{
+   string username = txtUsernameRegister->getStr();
+   string password = txtPasswordRegister->getStr();
+
+   txtUsernameRegister->clear();
+   txtPasswordRegister->clear();
+   // maybe clear rblClasses as well (add a method to RadioButtonList to enable this)
+
+   Player::PlayerClass playerClass;
+
+   switch (rblClasses->getSelectedButton()) {
+   case 0:
+      playerClass = Player::CLASS_WARRIOR;
+      break;
+   case 1:
+      playerClass = Player::CLASS_RANGER;
+      break;
+   default:
+      cout << "Invalid class selection" << endl;
+      playerClass = Player::CLASS_NONE;
+      break;
+   }
 
    msgTo.type = MSG_TYPE_REGISTER;
@@ -845 +904 @@
    strcpy(msgTo.buffer, username.c_str());
    strcpy(msgTo.buffer+username.size()+1, password.c_str());
+   memcpy(msgTo.buffer+username.size()+password.size()+2, &playerClass, 4);
 
    sendMessage(&msgTo, sock, &server);