diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/game.cpp | 6 | ||||
| -rw-r--r-- | src/gui/partywindow.cpp | 73 | ||||
| -rw-r--r-- | src/gui/partywindow.h | 74 | ||||
| -rw-r--r-- | tmw.cbp | 4 |
5 files changed, 161 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2008-04-25 David Athay <ko2fan@gmail.com> + + * src/game.cpp, src/gui/partywindow.h, src/gui/partywindow.cpp, + tmw.cbp: Added party window, updated codeblocks project file. + 2008-04-23 David Athay <ko2fan@gmail.com> * src/gui/guildwindow.h, src/net/partyhandler.h, diff --git a/src/game.cpp b/src/game.cpp index 039a1916..d762bde2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -62,6 +62,8 @@ #include "gui/npclistdialog.h" #include "gui/npc_text.h" #include "gui/ok_dialog.h" +#include "gui/partywindow.h" +#include "gui/quitdialog.h" #include "gui/sdlinput.h" #include "gui/sell.h" #include "gui/setup.h" @@ -69,7 +71,6 @@ #include "gui/status.h" #include "gui/trade.h" #include "gui/viewport.h" -#include "gui/quitdialog.h" #include "net/beinghandler.h" #include "net/buysellhandler.h" @@ -123,6 +124,7 @@ GuildWindow *guildWindow; HelpWindow *helpWindow; DebugWindow *debugWindow; ItemShortcutWindow *itemShortcutWindow; +PartyWindow *partyWindow; BeingManager *beingManager = NULL; FloorItemManager *floorItemManager = NULL; @@ -205,6 +207,7 @@ void createGuiWindows() helpWindow = new HelpWindow(); debugWindow = new DebugWindow(); itemShortcutWindow = new ItemShortcutWindow(); + partyWindow = new PartyWindow(); // Initialize window positions //chargeDialog->setPosition( @@ -252,6 +255,7 @@ void destroyGuiWindows() delete helpWindow; delete debugWindow; delete itemShortcutWindow; + delete partyWindow; } Game::Game(): diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp new file mode 100644 index 00000000..db066910 --- /dev/null +++ b/src/gui/partywindow.cpp @@ -0,0 +1,73 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $ + */ + +#include "partywindow.h" + +#include "../utils/gettext.h" + +PartyWindow::PartyWindow() : Window(_("Party")) +{ + setVisible(false); +} + +void PartyWindow::draw(gcn::Graphics *graphics) +{ + +} + +void PartyWindow::addPartyMember(Player *player) +{ + PartyList::iterator itr = std::find(mPartyMembers.begin(), + mPartyMembers.end(), + player); + if (itr == mPartyMembers.end()) + { + mPartyMembers.push_back(player); + } + + if (mPartyMembers.size() > 1) + { + setVisible(true); + } +} + +void PartyWindow::removePartyMember(Player *player) +{ + PartyList::iterator itr = std::find(mPartyMembers.begin(), + mPartyMembers.end(), + player); + if (itr != mPartyMembers.end()) + { + mPartyMembers.erase(itr); + } + + if (mPartyMembers.size() < 1) + { + setVisible(false); + } +} + +void PartyWindow::showPartyInvite(const std::string &inviter) +{ + +} diff --git a/src/gui/partywindow.h b/src/gui/partywindow.h new file mode 100644 index 00000000..b74b1411 --- /dev/null +++ b/src/gui/partywindow.h @@ -0,0 +1,74 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $ + */ + +#ifndef _TMW_PARTYWINDOW_H +#define _TMW_PARTYWINDOW_H + +#include "window.h" + +#include <string> +#include <vector> + +class Player; + +/** + * Party Window. + * + * \ingroup Interface + */ +class PartyWindow : public Window +{ + public: + /** + * Constructor. + */ + PartyWindow(); + + /** + * Draws the party window + */ + void draw(gcn::Graphics *graphics); + + /** + * Add party member + */ + void addPartyMember(Player *player); + + /** + * Remove party member + */ + void removePartyMember(Player *player); + + /** + * Show party invite + */ + void showPartyInvite(const std::string &inviter); + + private: + typedef std::vector<Player*> PartyList; + PartyList mPartyMembers; +}; + +extern PartyWindow *partyWindow; + +#endif @@ -269,6 +269,8 @@ <Unit filename="src/gui/ok_dialog.h"> <Option target="default" /> </Unit> + <Unit filename="src/gui/partywindow.cpp" /> + <Unit filename="src/gui/partywindow.h" /> <Unit filename="src/gui/passwordfield.cpp" /> <Unit filename="src/gui/passwordfield.h"> <Option target="default" /> @@ -728,6 +730,8 @@ <Unit filename="src/utils/gettext.h"> <Option target="default" /> </Unit> + <Unit filename="src/utils/sha256.cpp" /> + <Unit filename="src/utils/sha256.h" /> <Unit filename="src/utils/strprintf.cpp" /> <Unit filename="src/utils/strprintf.h"> <Option target="default" /> |