Index: client/Client/Window.cpp =================================================================== --- client/Client/Window.cpp (revision cbc70ebba9601e9297b1c38c555649503e4dc839) +++ client/Client/Window.cpp (revision 9bfc1cb345b8dbf607aa15080337ef640459d995) @@ -8,11 +8,10 @@ Window::~Window(void) { - for(unsigned int x=0; xvctGui.size(); x++) - delete this->vctGui[x]; } -void Window::addComponent(GuiComponent *comp) +GuiComponent* Window::addComponent(GuiComponent* comp) { this->vctGui.push_back(comp); + return comp; } Index: client/Client/Window.h =================================================================== --- client/Client/Window.h (revision cbc70ebba9601e9297b1c38c555649503e4dc839) +++ client/Client/Window.h (revision 9bfc1cb345b8dbf607aa15080337ef640459d995) @@ -18,5 +18,5 @@ ~Window(void); - void addComponent(GuiComponent *comp); + GuiComponent* addComponent(GuiComponent* comp); GuiComponent* getComponent(int x); void draw(ALLEGRO_DISPLAY *display); Index: client/Client/main.cpp =================================================================== --- client/Client/main.cpp (revision cbc70ebba9601e9297b1c38c555649503e4dc839) +++ client/Client/main.cpp (revision 9bfc1cb345b8dbf607aa15080337ef640459d995) @@ -22,4 +22,5 @@ #include #include +#include #include @@ -88,10 +89,11 @@ bool doexit; +vector vctComponents; + Window* wndLogin; Window* wndRegister; Window* wndLobby; -Window* wndGame; +Window* wndLobbyDebug; Window* wndNewGame; -Window* wndGameDebug; Window* wndGameSummary; Window* wndCurrent; @@ -111,6 +113,4 @@ Textbox* txtJoinGame; Textbox* txtCreateGame; - -// wndGame Textbox* txtChat; @@ -213,13 +213,13 @@ wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H); - wndLogin->addComponent(new Textbox(516, 40, 100, 20, font)); - wndLogin->addComponent(new Textbox(516, 70, 100, 20, font)); - wndLogin->addComponent(new TextLabel(410, 40, 100, 20, font, "Username:", ALLEGRO_ALIGN_RIGHT)); - wndLogin->addComponent(new TextLabel(410, 70, 100, 20, font, "Password:", ALLEGRO_ALIGN_RIGHT)); - wndLogin->addComponent(new TextLabel((SCREEN_W-600)/2, 100, 600, 20, font, "", ALLEGRO_ALIGN_CENTRE)); - wndLogin->addComponent(new Button(SCREEN_W/2-100, 130, 90, 20, font, "Register", goToRegisterScreen)); - wndLogin->addComponent(new Button(SCREEN_W/2+10, 130, 90, 20, font, "Login", login)); - wndLogin->addComponent(new Button(920, 10, 80, 20, font, "Quit", quit)); - wndLogin->addComponent(new Button(20, 10, 160, 20, font, "Toggle Debugging", toggleDebugging)); + vctComponents.push_back(wndLogin->addComponent(new Textbox(516, 40, 100, 20, font))); + vctComponents.push_back(wndLogin->addComponent(new Textbox(516, 70, 100, 20, font))); + vctComponents.push_back(wndLogin->addComponent(new TextLabel(410, 40, 100, 20, font, "Username:", ALLEGRO_ALIGN_RIGHT))); + vctComponents.push_back(wndLogin->addComponent(new TextLabel(410, 70, 100, 20, font, "Password:", ALLEGRO_ALIGN_RIGHT))); + vctComponents.push_back(wndLogin->addComponent(new TextLabel((SCREEN_W-600)/2, 100, 600, 20, font, "", ALLEGRO_ALIGN_CENTRE))); + vctComponents.push_back(wndLogin->addComponent(new Button(SCREEN_W/2-100, 130, 90, 20, font, "Register", goToRegisterScreen))); + vctComponents.push_back(wndLogin->addComponent(new Button(SCREEN_W/2+10, 130, 90, 20, font, "Login", login))); + vctComponents.push_back(wndLogin->addComponent(new Button(920, 10, 80, 20, font, "Quit", quit))); + vctComponents.push_back(wndLogin->addComponent(new Button(20, 10, 160, 20, font, "Toggle Debugging", toggleDebugging))); txtUsername = (Textbox*)wndLogin->getComponent(0); @@ -230,14 +230,14 @@ wndRegister = new Window(0, 0, SCREEN_W, SCREEN_H); - wndRegister->addComponent(new Textbox(516, 40, 100, 20, font)); - wndRegister->addComponent(new Textbox(516, 70, 100, 20, font)); - wndRegister->addComponent(new TextLabel(410, 40, 100, 20, font, "Username:", ALLEGRO_ALIGN_RIGHT)); - wndRegister->addComponent(new TextLabel(410, 70, 100, 20, font, "Password:", ALLEGRO_ALIGN_RIGHT)); - wndRegister->addComponent(new RadioButtonList(432, 100, "Pick a class", font)); - wndRegister->addComponent(new TextLabel((SCREEN_W-600)/2, 190, 600, 20, font, "", ALLEGRO_ALIGN_CENTRE)); - wndRegister->addComponent(new Button(SCREEN_W/2-100, 220, 90, 20, font, "Back", goToLoginScreen)); - wndRegister->addComponent(new Button(SCREEN_W/2+10, 220, 90, 20, font, "Submit", registerAccount)); - wndRegister->addComponent(new Button(920, 10, 80, 20, font, "Quit", quit)); - wndRegister->addComponent(new Button(20, 10, 160, 20, font, "Toggle Debugging", toggleDebugging)); + vctComponents.push_back(wndRegister->addComponent(new Textbox(516, 40, 100, 20, font))); + vctComponents.push_back(wndRegister->addComponent(new Textbox(516, 70, 100, 20, font))); + vctComponents.push_back(wndRegister->addComponent(new TextLabel(410, 40, 100, 20, font, "Username:", ALLEGRO_ALIGN_RIGHT))); + vctComponents.push_back(wndRegister->addComponent(new TextLabel(410, 70, 100, 20, font, "Password:", ALLEGRO_ALIGN_RIGHT))); + vctComponents.push_back(wndRegister->addComponent(new RadioButtonList(432, 100, "Pick a class", font))); + vctComponents.push_back(wndRegister->addComponent(new TextLabel((SCREEN_W-600)/2, 190, 600, 20, font, "", ALLEGRO_ALIGN_CENTRE))); + vctComponents.push_back(wndRegister->addComponent(new Button(SCREEN_W/2-100, 220, 90, 20, font, "Back", goToLoginScreen))); + vctComponents.push_back(wndRegister->addComponent(new Button(SCREEN_W/2+10, 220, 90, 20, font, "Submit", registerAccount))); + vctComponents.push_back(wndRegister->addComponent(new Button(920, 10, 80, 20, font, "Quit", quit))); + vctComponents.push_back(wndRegister->addComponent(new Button(20, 10, 160, 20, font, "Toggle Debugging", toggleDebugging))); txtUsernameRegister = (Textbox*)wndRegister->getComponent(0); @@ -252,42 +252,46 @@ cout << "Created register screen" << endl; + txtJoinGame = new Textbox(SCREEN_W*1/2+15+4, 40, 100, 20, font); + txtCreateGame = new Textbox(SCREEN_W*3/4+4, 40, 100, 20, font); + + vctComponents.push_back(txtJoinGame); + vctComponents.push_back(txtCreateGame); + wndLobby = new Window(0, 0, SCREEN_W, SCREEN_H); - wndLobby->addComponent(new Button(920, 10, 80, 20, font, "Logout", logout)); - wndLobby->addComponent(new TextLabel(SCREEN_W*1/2+15-112, 40, 110, 20, font, "Game Name:", ALLEGRO_ALIGN_RIGHT)); - wndLobby->addComponent(new Textbox(SCREEN_W*1/2+15+4, 40, 100, 20, font)); - wndLobby->addComponent(new Button(SCREEN_W*1/2+15-100, 80, 200, 20, font, "Join Existing Game", joinGame)); - wndLobby->addComponent(new TextLabel(SCREEN_W*3/4-112, 40, 110, 20, font, "Game Name:", ALLEGRO_ALIGN_RIGHT)); - wndLobby->addComponent(new Textbox(SCREEN_W*3/4+4, 40, 100, 20, font)); - wndLobby->addComponent(new Button(SCREEN_W*3/4-100, 80, 200, 20, font, "Create New Game", createGame)); - wndLobby->addComponent(new Textbox(95, 40, 300, 20, font)); - wndLobby->addComponent(new Button(95, 70, 60, 20, font, "Send", sendChatMessage)); - - txtJoinGame = (Textbox*)wndLobby->getComponent(2); - txtCreateGame = (Textbox*)wndLobby->getComponent(5); + vctComponents.push_back(wndLobby->addComponent(new Button(920, 10, 80, 20, font, "Logout", logout))); + vctComponents.push_back(wndLobby->addComponent(new TextLabel(SCREEN_W*1/2+15-112, 40, 110, 20, font, "Game Name:", ALLEGRO_ALIGN_RIGHT))); + wndLobby->addComponent(txtJoinGame); + vctComponents.push_back(wndLobby->addComponent(new Button(SCREEN_W*1/2+15-100, 80, 200, 20, font, "Join Existing Game", joinGame))); + vctComponents.push_back(wndLobby->addComponent(new TextLabel(SCREEN_W*3/4-112, 40, 110, 20, font, "Game Name:", ALLEGRO_ALIGN_RIGHT))); + wndLobby->addComponent(txtCreateGame); + vctComponents.push_back(wndLobby->addComponent(new Button(SCREEN_W*3/4-100, 80, 200, 20, font, "Create New Game", createGame))); + vctComponents.push_back(wndLobby->addComponent(new Textbox(95, 40, 300, 20, font))); + vctComponents.push_back(wndLobby->addComponent(new Button(95, 70, 60, 20, font, "Send", sendChatMessage))); + vctComponents.push_back(wndLobby->addComponent(new Button(20, 10, 160, 20, font, "Toggle Debugging", toggleDebugging))); + + txtChat = (Textbox*)wndLobby->getComponent(7); cout << "Created lobby screen" << endl; - // this is the old game screen - wndGame = new Window(0, 0, SCREEN_W, SCREEN_H); - wndGame->addComponent(new Textbox(95, 40, 300, 20, font)); - wndGame->addComponent(new Button(95, 70, 60, 20, font, "Send", sendChatMessage)); - wndGame->addComponent(new Button(20, 10, 160, 20, font, "Toggle Debugging", toggleDebugging)); - wndGame->addComponent(new Button(920, 10, 80, 20, font, "Logout", logout)); - - wndGameDebug = new Window(0, 0, SCREEN_W, SCREEN_H); - wndGameDebug->addComponent(new Button(20, 10, 160, 20, font, "Toggle Debugging", toggleDebugging)); - wndGameDebug->addComponent(new Button(920, 10, 80, 20, font, "Logout", logout)); - - cout << "Created game screen" << endl; - - // this is the new game screen, without a debug console + wndLobbyDebug = new Window(0, 0, SCREEN_W, SCREEN_H); + vctComponents.push_back(wndLobbyDebug->addComponent(new Button(920, 10, 80, 20, font, "Logout", logout))); + vctComponents.push_back(wndLobbyDebug->addComponent(new TextLabel(SCREEN_W*1/2+15-112, 40, 110, 20, font, "Game Name:", ALLEGRO_ALIGN_RIGHT))); + wndLobbyDebug->addComponent(txtJoinGame); + vctComponents.push_back(wndLobbyDebug->addComponent(new Button(SCREEN_W*1/2+15-100, 80, 200, 20, font, "Join Existing Game", joinGame))); + vctComponents.push_back(wndLobbyDebug->addComponent(new TextLabel(SCREEN_W*3/4-112, 40, 110, 20, font, "Game Name:", ALLEGRO_ALIGN_RIGHT))); + wndLobbyDebug->addComponent(txtCreateGame); + vctComponents.push_back(wndLobbyDebug->addComponent(new Button(SCREEN_W*3/4-100, 80, 200, 20, font, "Create New Game", createGame))); + vctComponents.push_back(wndLobbyDebug->addComponent(new Button(20, 10, 160, 20, font, "Toggle Debugging", toggleDebugging))); + + cout << "Created debug lobby screen" << endl; + wndNewGame = new Window(0, 0, SCREEN_W, SCREEN_H); - wndNewGame->addComponent(new Button(880, 10, 120, 20, font, "Leave Game", leaveGame)); + vctComponents.push_back(wndNewGame->addComponent(new Button(880, 10, 120, 20, font, "Leave Game", leaveGame))); cout << "Created new game screen" << endl; wndGameSummary = new Window(0, 0, SCREEN_W, SCREEN_H); - wndGameSummary->addComponent(new Button(840, 730, 160, 20, font, "Back to Lobby", closeGameSummary)); + vctComponents.push_back(wndGameSummary->addComponent(new Button(840, 730, 160, 20, font, "Back to Lobby", closeGameSummary))); cout << "Created game summary screen" << endl; @@ -394,5 +398,5 @@ } else if(ev.type == ALLEGRO_EVENT_MOUSE_BUTTON_UP) { - if(wndCurrent == wndGame || wndCurrent == wndNewGame) { + if(wndCurrent == wndNewGame) { if (ev.mouse.button == 1) { // left click msgTo.type = MSG_TYPE_PLAYER_MOVE; @@ -455,11 +459,12 @@ msgProcessor.resendUnackedMessages(); - if (debugging && wndCurrent == wndGame) - wndGameDebug->draw(display); + if (debugging && wndCurrent == wndLobby) + wndLobbyDebug->draw(display); else wndCurrent->draw(display); if (wndCurrent == wndLobby) { - chatConsole.draw(font, al_map_rgb(255,255,255)); + if (!debugging) + chatConsole.draw(font, al_map_rgb(255,255,255)); map::iterator it; @@ -537,61 +542,6 @@ } } - else if (wndCurrent == wndGame) + else if (wndCurrent == wndGameSummary) { - if (!debugging) - chatConsole.draw(font, al_map_rgb(255,255,255)); - - al_draw_text(font, al_map_rgb(0, 255, 0), 4, 43, ALLEGRO_ALIGN_LEFT, "Message:"); - - ostringstream ossScoreBlue, ossScoreRed; - - ossScoreBlue << "Blue: " << game->getBlueScore() << endl; - ossScoreRed << "Red: " << game->getRedScore() << endl; - - al_draw_text(font, al_map_rgb(0, 255, 0), 330, 80, ALLEGRO_ALIGN_LEFT, ossScoreBlue.str().c_str()); - al_draw_text(font, al_map_rgb(0, 255, 0), 515, 80, ALLEGRO_ALIGN_LEFT, ossScoreRed.str().c_str()); - - // update players - map::iterator it; - for (it = mapPlayers.begin(); it != mapPlayers.end(); it++) - { - it->second->updateTarget(mapPlayers); - } - - for (it = mapPlayers.begin(); it != mapPlayers.end(); it++) - { - it->second->move(gameMap); // ignore return value - } - - // update projectile positions - map::iterator it2; - for (it2 = mapProjectiles.begin(); it2 != mapProjectiles.end(); it2++) - { - it2->second.move(mapPlayers); - } - - GameRender::drawMap(gameMap); - GameRender::drawPlayers(mapPlayers, font, curPlayerId); - - // draw projectiles - for (it2 = mapProjectiles.begin(); it2 != mapProjectiles.end(); it2++) - { - Projectile proj = it2->second; - - FLOAT_POSITION target = mapPlayers[proj.target]->pos; - float angle = atan2(target.y-proj.pos.toFloat().y, target.x-proj.pos.toFloat().x); - - POSITION start, end; - start.x = cos(angle)*15+proj.pos.x; - start.y = sin(angle)*15+proj.pos.y; - end.x = proj.pos.x; - end.y = proj.pos.y; - - start = mapToScreen(start); - end = mapToScreen(end); - - al_draw_line(start.x, start.y, end.x, end.y, al_map_rgb(0, 0, 0), 4); - } - }else if (wndCurrent == wndGameSummary) { ostringstream ossBlueScore, ossRedScore; @@ -631,9 +581,14 @@ shutdownWinSock(); + // delete all components + for (unsigned int x=0; x