diff options
62 files changed, 132 insertions, 128 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dd8be3f4..8c59388b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -116,14 +116,14 @@ SET(SRCS gui/buy.h gui/buysell.cpp gui/buysell.h - gui/char_select.cpp - gui/char_select.h + gui/charselectdialog.cpp + gui/charselectdialog.h gui/charcreatedialog.cpp gui/charcreatedialog.h gui/chat.cpp gui/chat.h - gui/confirm_dialog.cpp - gui/confirm_dialog.h + gui/confirmdialog.cpp + gui/confirmdialog.h gui/debugwindow.cpp gui/debugwindow.h gui/emotecontainer.cpp @@ -150,8 +150,8 @@ SET(SRCS gui/itempopup.h gui/itemshortcutcontainer.cpp gui/itemshortcutcontainer.h - gui/item_amount.cpp - gui/item_amount.h + gui/itemamount.cpp + gui/itemamount.h gui/linkhandler.h gui/login.cpp gui/login.h @@ -169,10 +169,10 @@ SET(SRCS gui/npcpostdialog.h gui/npcstringdialog.cpp gui/npcstringdialog.h - gui/npc_text.cpp - gui/npc_text.h - gui/ok_dialog.cpp - gui/ok_dialog.h + gui/npctextdialog.cpp + gui/npctextdialog.h + gui/okdialog.cpp + gui/okdialog.h gui/palette.cpp gui/palette.h gui/partywindow.cpp @@ -223,8 +223,8 @@ SET(SRCS gui/storagewindow.h gui/table.cpp gui/table.h - gui/table_model.cpp - gui/table_model.h + gui/tablemodel.cpp + gui/tablemodel.h gui/textdialog.cpp gui/textdialog.h gui/textrenderer.h @@ -341,8 +341,8 @@ SET(SRCS engine.h equipment.cpp equipment.h - floor_item.cpp - floor_item.h + flooritem.cpp + flooritem.h flooritemmanager.cpp flooritemmanager.h game.cpp @@ -387,8 +387,8 @@ SET(SRCS particleemitterprop.h player.cpp player.h - player_relations.cpp - player_relations.h + playerrelations.cpp + playerrelations.h position.cpp position.h properties.h diff --git a/src/Makefile.am b/src/Makefile.am index 567843e3..c22fd91d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,14 +69,14 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/buy.h \ gui/buysell.cpp \ gui/buysell.h \ - gui/char_select.cpp \ - gui/char_select.h \ + gui/charselectdialog.cpp \ + gui/charselectdialog.h \ gui/charcreatedialog.cpp \ gui/charcreatedialog.h \ gui/chat.cpp \ gui/chat.h \ - gui/confirm_dialog.cpp \ - gui/confirm_dialog.h \ + gui/confirmdialog.cpp \ + gui/confirmdialog.h \ gui/debugwindow.cpp \ gui/debugwindow.h \ gui/emotecontainer.cpp \ @@ -95,8 +95,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/help.h \ gui/inventorywindow.cpp \ gui/inventorywindow.h \ - gui/item_amount.cpp \ - gui/item_amount.h \ + gui/itemamount.cpp \ + gui/itemamount.h \ gui/itemcontainer.cpp \ gui/itemcontainer.h \ gui/itemlinkhandler.cpp \ @@ -114,8 +114,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/minimap.h \ gui/ministatus.cpp \ gui/ministatus.h \ - gui/npc_text.cpp \ - gui/npc_text.h \ + gui/npctextdialog.cpp \ + gui/npctextdialog.h \ gui/npcintegerdialog.cpp \ gui/npcintegerdialog.h \ gui/npclistdialog.cpp \ @@ -124,8 +124,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/npcpostdialog.h \ gui/npcstringdialog.cpp \ gui/npcstringdialog.h \ - gui/ok_dialog.cpp \ - gui/ok_dialog.h \ + gui/okdialog.cpp \ + gui/okdialog.h \ gui/palette.cpp \ gui/palette.h \ gui/partywindow.cpp \ @@ -176,8 +176,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/storagewindow.h \ gui/table.cpp \ gui/table.h \ - gui/table_model.cpp \ - gui/table_model.h \ + gui/tablemodel.cpp \ + gui/tablemodel.h \ gui/textdialog.cpp \ gui/textdialog.h \ gui/textrenderer.h \ @@ -294,8 +294,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ engine.h \ equipment.cpp \ equipment.h \ - floor_item.cpp \ - floor_item.h \ + flooritem.cpp \ + flooritem.h \ flooritemmanager.cpp \ flooritemmanager.h \ game.cpp \ @@ -340,8 +340,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ particleemitterprop.h \ player.cpp \ player.h \ - player_relations.cpp \ - player_relations.h \ + playerrelations.cpp \ + playerrelations.h \ position.cpp \ position.h \ properties.h \ diff --git a/src/channel.cpp b/src/channel.cpp index a98d315c..154b016d 100644 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -21,6 +21,8 @@ #include "channel.h" +#include "gui/widgets/channeltab.h" + Channel::Channel(short id, const std::string &name, const std::string &announcement) : diff --git a/src/channel.h b/src/channel.h index b2080d4a..230ca915 100644 --- a/src/channel.h +++ b/src/channel.h @@ -24,7 +24,7 @@ #include <string> -#include "gui/widgets/channeltab.h" +class ChannelTab; class Channel { @@ -43,18 +43,18 @@ class Channel ~Channel(); /** - * Get the id associated witht his channel + * Get the id associated witht his channel. */ int getId() const { return mId; } /** - * Get this channel's name + * Get this channel's name. */ const std::string &getName() const { return mName; } /** - * Get the announcement message for this channel + * Get the announcement message for this channel. */ const std::string &getAnnouncement() const { return mAnnouncement; } diff --git a/src/floor_item.cpp b/src/flooritem.cpp index b8c0ffaf..b08258c1 100644 --- a/src/floor_item.cpp +++ b/src/flooritem.cpp @@ -19,7 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "floor_item.h" +#include "flooritem.h" + #include "graphics.h" #include "item.h" #include "map.h" @@ -56,7 +57,7 @@ int FloorItem::getItemId() const return mItem->getId(); } -Item* FloorItem::getItem() const +Item *FloorItem::getItem() const { return mItem; } diff --git a/src/floor_item.h b/src/flooritem.h index 0e269c77..9911cd25 100644 --- a/src/floor_item.h +++ b/src/flooritem.h @@ -64,10 +64,10 @@ class FloorItem : public Sprite int getItemId() const; /** - * Returns the item object. Useful for adding an item link for the floor - * item to chat. + * Returns the item object. Useful for adding an item link for the + * floor item to chat. */ - Item* getItem() const; + Item *getItem() const; /** * Returns the x coordinate. diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp index 5d2799d4..9bfd02ae 100644 --- a/src/flooritemmanager.cpp +++ b/src/flooritemmanager.cpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "floor_item.h" #include "flooritemmanager.h" +#include "flooritem.h" #include "utils/dtor.h" diff --git a/src/game.cpp b/src/game.cpp index 47d3b99c..1ccc46e7 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -37,13 +37,13 @@ #include "map.h" #include "npc.h" #include "particle.h" -#include "player_relations.h" +#include "playerrelations.h" #include "gui/widgets/chattab.h" #include "gui/buy.h" #include "gui/buysell.h" #include "gui/chat.h" -#include "gui/confirm_dialog.h" +#include "gui/confirmdialog.h" #include "gui/debugwindow.h" #include "gui/emoteshortcutcontainer.h" #include "gui/emotewindow.h" @@ -59,8 +59,8 @@ #include "gui/npcintegerdialog.h" #include "gui/npclistdialog.h" #include "gui/npcstringdialog.h" -#include "gui/npc_text.h" -#include "gui/ok_dialog.h" +#include "gui/npctextdialog.h" +#include "gui/okdialog.h" #include "gui/sdlinput.h" #include "gui/sell.h" #include "gui/setup.h" diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp index 0955ffca..798c172e 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/changeemaildialog.cpp @@ -26,7 +26,7 @@ #include "logindata.h" #include "gui/register.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index 403d9afc..42854896 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -26,7 +26,7 @@ #include "logindata.h" #include "gui/register.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/passwordfield.h" diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp index dc982e21..8513d573 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/charcreatedialog.cpp @@ -21,9 +21,9 @@ #include "gui/charcreatedialog.h" -#include "gui/char_select.h" -#include "gui/confirm_dialog.h" -#include "gui/ok_dialog.h" +#include "gui/charselectdialog.h" +#include "gui/confirmdialog.h" +#include "gui/okdialog.h" #include "gui/playerbox.h" #include "gui/widgets/button.h" diff --git a/src/gui/char_select.cpp b/src/gui/charselectdialog.cpp index ddcc62a5..afc349ea 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/charselectdialog.cpp @@ -19,11 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "gui/char_select.h" +#include "gui/charselectdialog.h" #include "gui/charcreatedialog.h" -#include "gui/confirm_dialog.h" -#include "gui/ok_dialog.h" +#include "gui/confirmdialog.h" +#include "gui/okdialog.h" #include "gui/playerbox.h" #ifdef TMWSERV_SUPPORT diff --git a/src/gui/char_select.h b/src/gui/charselectdialog.h index 75a98465..75a98465 100644 --- a/src/gui/char_select.h +++ b/src/gui/charselectdialog.h diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirmdialog.cpp index 7caa4580..19c32999 100644 --- a/src/gui/confirm_dialog.cpp +++ b/src/gui/confirmdialog.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "gui/confirm_dialog.h" +#include "gui/confirmdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/textbox.h" diff --git a/src/gui/confirm_dialog.h b/src/gui/confirmdialog.h index 38ea2abd..38ea2abd 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirmdialog.h diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp index a6bcb690..6dc86e13 100644 --- a/src/gui/guildwindow.cpp +++ b/src/gui/guildwindow.cpp @@ -22,7 +22,7 @@ #include "gui/guildwindow.h" -#include "gui/confirm_dialog.h" +#include "gui/confirmdialog.h" #include "gui/guildlistbox.h" #include "gui/textdialog.h" diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 33115f96..2b397ed7 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -21,7 +21,7 @@ #include "gui/inventorywindow.h" -#include "gui/item_amount.h" +#include "gui/itemamount.h" #include "gui/itemcontainer.h" #include "gui/sdlinput.h" #include "gui/viewport.h" diff --git a/src/gui/item_amount.cpp b/src/gui/itemamount.cpp index d259481e..518eb761 100644 --- a/src/gui/item_amount.cpp +++ b/src/gui/itemamount.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "gui/item_amount.h" +#include "gui/itemamount.h" #ifdef EATHENA_SUPPORT #include "gui/storagewindow.h" diff --git a/src/gui/item_amount.h b/src/gui/itemamount.h index 94ca8dc2..94ca8dc2 100644 --- a/src/gui/item_amount.h +++ b/src/gui/itemamount.h diff --git a/src/gui/login.cpp b/src/gui/login.cpp index 021f8d4b..8391a5c4 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -21,7 +21,7 @@ #include "gui/login.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp index 2a04acd2..41b6985c 100644 --- a/src/gui/npcintegerdialog.cpp +++ b/src/gui/npcintegerdialog.cpp @@ -21,7 +21,7 @@ #include "gui/npcintegerdialog.h" -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/inttextfield.h" diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp index 97f9fdb7..65e4263e 100644 --- a/src/gui/npclistdialog.cpp +++ b/src/gui/npclistdialog.cpp @@ -21,7 +21,7 @@ #include "gui/npclistdialog.h" -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/layout.h" diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp index 446078e8..e5767c5f 100644 --- a/src/gui/npcstringdialog.cpp +++ b/src/gui/npcstringdialog.cpp @@ -21,7 +21,7 @@ #include "gui/npcstringdialog.h" -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/layout.h" diff --git a/src/gui/npc_text.cpp b/src/gui/npctextdialog.cpp index 770683eb..849c94ec 100644 --- a/src/gui/npc_text.cpp +++ b/src/gui/npctextdialog.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/layout.h" diff --git a/src/gui/npc_text.h b/src/gui/npctextdialog.h index ad32fdf4..ad32fdf4 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npctextdialog.h diff --git a/src/gui/ok_dialog.cpp b/src/gui/okdialog.cpp index fc8c81db..9da070eb 100644 --- a/src/gui/ok_dialog.cpp +++ b/src/gui/okdialog.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/gui.h" diff --git a/src/gui/ok_dialog.h b/src/gui/okdialog.h index 5df2fb4f..5df2fb4f 100644 --- a/src/gui/ok_dialog.h +++ b/src/gui/okdialog.h diff --git a/src/gui/partywindow.h b/src/gui/partywindow.h index 63646008..c915d9ce 100644 --- a/src/gui/partywindow.h +++ b/src/gui/partywindow.h @@ -22,7 +22,7 @@ #ifndef PARTYWINDOW_H #define PARTYWINDOW_H -#include "gui/confirm_dialog.h" +#include "gui/confirmdialog.h" #include "gui/widgets/avatar.h" #include "gui/widgets/window.h" diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 2c820bab..c76a9065 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -23,18 +23,18 @@ #include "gui/chat.h" #include "gui/inventorywindow.h" -#include "gui/item_amount.h" +#include "gui/itemamount.h" #include "gui/widgets/browserbox.h" #include "being.h" #include "beingmanager.h" -#include "floor_item.h" +#include "flooritem.h" #include "graphics.h" #include "item.h" #include "localplayer.h" #include "npc.h" -#include "player_relations.h" +#include "playerrelations.h" #include "net/adminhandler.h" #include "net/net.h" diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 04da656b..dabf98fd 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -27,7 +27,7 @@ #include "main.h" #include "gui/login.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 9fb6b6a2..f3b0739a 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -21,7 +21,7 @@ #include "gui/serverdialog.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index 05a9eaa2..9417ad68 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -21,7 +21,7 @@ #include "gui/setup_audio.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/label.h" diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 9e43b322..0c15a1ee 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -22,7 +22,7 @@ #include "gui/setup_keyboard.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/layouthelper.h" diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index 367d21a2..01a99567 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -21,7 +21,7 @@ #include "gui/setup_players.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/table.h" #include "gui/widgets/button.h" diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index c2e6a682..d7507d19 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -26,7 +26,7 @@ #include "gui/setuptab.h" -#include "player_relations.h" +#include "playerrelations.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 4cae18ba..bf20658c 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -21,7 +21,7 @@ #include "gui/setup_video.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/label.h" diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp index df6df65a..aada0bb2 100644 --- a/src/gui/storagewindow.cpp +++ b/src/gui/storagewindow.cpp @@ -20,8 +20,9 @@ */ #include "gui/storagewindow.h" + #include "gui/inventorywindow.h" -#include "gui/item_amount.h" +#include "gui/itemamount.h" #include "gui/itemcontainer.h" #include "gui/viewport.h" diff --git a/src/gui/table.h b/src/gui/table.h index d73cf340..42fbab0e 100644 --- a/src/gui/table.h +++ b/src/gui/table.h @@ -22,13 +22,13 @@ #ifndef TABLE_H #define TABLE_H -#include <vector> +#include "tablemodel.h" #include <guichan/keylistener.hpp> #include <guichan/mouselistener.hpp> #include <guichan/widget.hpp> -#include "table_model.h" +#include <vector> class GuiTableActionListener; diff --git a/src/gui/table_model.cpp b/src/gui/tablemodel.cpp index 4fa13bae..e362a314 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/tablemodel.cpp @@ -19,11 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <guichan/widget.hpp> +#include "tablemodel.h" -#include "table_model.h" +#include "utils/dtor.h" -#include "../utils/dtor.h" +#include <guichan/widget.hpp> void TableModel::installListener(TableModelListener *listener) { diff --git a/src/gui/table_model.h b/src/gui/tablemodel.h index 9ca36120..a884932f 100644 --- a/src/gui/table_model.h +++ b/src/gui/tablemodel.h @@ -22,6 +22,8 @@ #ifndef TABLE_MODEL_H #define TABLE_MODEL_H +#include <guichanfwd.h> + #include <set> #include <vector> diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index 95e5dc47..9e39645d 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -27,7 +27,7 @@ #include "units.h" #include "gui/inventorywindow.h" -#include "gui/item_amount.h" +#include "gui/itemamount.h" #include "gui/itemcontainer.h" #include "gui/widgets/button.h" diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index b51d199e..c0959cc9 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -25,7 +25,7 @@ #include "log.h" #include "logindata.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/register.h" #include "gui/widgets/button.h" diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 765c9bd2..017668dc 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -23,7 +23,7 @@ #include "configuration.h" #include "equipment.h" -#include "floor_item.h" +#include "flooritem.h" #include "game.h" #include "graphics.h" #include "inventory.h" diff --git a/src/main.cpp b/src/main.cpp index d35fa985..a18a370c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,7 +34,7 @@ #ifdef USE_OPENGL #include "openglgraphics.h" #endif -#include "player_relations.h" +#include "playerrelations.h" #include "serverinfo.h" #include "sound.h" #include "statuseffect.h" @@ -45,10 +45,10 @@ #include "gui/widgets/label.h" #include "gui/widgets/progressbar.h" -#include "gui/char_select.h" +#include "gui/charselectdialog.h" #include "gui/gui.h" #include "gui/login.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/palette.h" #include "gui/register.h" #include "gui/sdlinput.h" diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index c84cdea3..c3f960c7 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -30,7 +30,7 @@ #include "being.h" #include "beingmanager.h" #include "game.h" -#include "player_relations.h" +#include "playerrelations.h" #include "gui/widgets/chattab.h" diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index b6eab2c7..65d19040 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -33,9 +33,9 @@ #include "localplayer.h" #include "log.h" #include "npc.h" -#include "player_relations.h" +#include "playerrelations.h" -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" #include <iostream> diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index fab1ffe3..c1d84265 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -33,7 +33,7 @@ #include "main.h" #include "gui/charcreatedialog.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 26af36dd..db89e316 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -30,7 +30,7 @@ #include "beingmanager.h" #include "game.h" #include "localplayer.h" -#include "player_relations.h" +#include "playerrelations.h" #include "gui/widgets/chattab.h" @@ -40,8 +40,6 @@ #include <string> -#define SERVER_NAME "Server" - Net::ChatHandler *chatHandler; namespace EAthena { @@ -96,7 +94,7 @@ void ChatHandler::handleMessage(MessageIn &msg) chatMsg = msg.readString(chatMsgLength); - if (nick != SERVER_NAME) + if (nick != "Server") { if (player_relations.hasPermission(nick, PlayerRelation::WHISPER)) chatWindow->whisper(nick, chatMsg); diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 05313798..5c41c380 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -32,7 +32,7 @@ #include "localplayer.h" #include "npc.h" -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" #include "gui/npcintegerdialog.h" #include "gui/npclistdialog.h" #include "gui/npcstringdialog.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 4ff480d6..ef6edc87 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -35,11 +35,11 @@ #include "gui/buy.h" #include "gui/buysell.h" #include "gui/gui.h" -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" #include "gui/npcintegerdialog.h" #include "gui/npclistdialog.h" #include "gui/npcstringdialog.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "gui/sell.h" #include "gui/skill.h" #include "gui/storagewindow.h" diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 1bf7e303..ee8e6733 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -29,9 +29,9 @@ #include "inventory.h" #include "item.h" #include "localplayer.h" -#include "player_relations.h" +#include "playerrelations.h" -#include "gui/confirm_dialog.h" +#include "gui/confirmdialog.h" #include "gui/trade.h" #include "gui/widgets/chattab.h" diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 63a1ea3d..0998da04 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -23,7 +23,7 @@ #define PLAYERHANDLER_H #include "being.h" -#include "floor_item.h" +#include "flooritem.h" #include "localplayer.h" namespace Net { diff --git a/src/net/tmwserv/beinghandler.cpp b/src/net/tmwserv/beinghandler.cpp index 581640db..1ec13800 100644 --- a/src/net/tmwserv/beinghandler.cpp +++ b/src/net/tmwserv/beinghandler.cpp @@ -35,7 +35,7 @@ #include "particle.h" #include "sound.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "utils/gettext.h" diff --git a/src/net/tmwserv/charserverhandler.cpp b/src/net/tmwserv/charserverhandler.cpp index 225c12a8..273c2d8f 100644 --- a/src/net/tmwserv/charserverhandler.cpp +++ b/src/net/tmwserv/charserverhandler.cpp @@ -36,7 +36,7 @@ #include "main.h" #include "gui/charcreatedialog.h" -#include "gui/ok_dialog.h" +#include "gui/okdialog.h" #include "utils/gettext.h" diff --git a/src/net/tmwserv/npchandler.cpp b/src/net/tmwserv/npchandler.cpp index 5670bd69..20a13ec2 100644 --- a/src/net/tmwserv/npchandler.cpp +++ b/src/net/tmwserv/npchandler.cpp @@ -35,7 +35,7 @@ #include "gui/npclistdialog.h" #include "gui/npcpostdialog.h" -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" Net::NpcHandler *npcHandler; diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp index 441b5021..e2b5cec4 100644 --- a/src/net/tmwserv/playerhandler.cpp +++ b/src/net/tmwserv/playerhandler.cpp @@ -41,8 +41,8 @@ #include "gui/chat.h" #include "gui/gui.h" #include "gui/npclistdialog.h" -#include "gui/npc_text.h" -#include "gui/ok_dialog.h" +#include "gui/npctextdialog.h" +#include "gui/okdialog.h" #include "gui/sell.h" #include "gui/skill.h" #include "gui/viewport.h" diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp index ae190c96..4c462a3f 100644 --- a/src/net/tmwserv/tradehandler.cpp +++ b/src/net/tmwserv/tradehandler.cpp @@ -35,7 +35,7 @@ #include "item.h" #include "localplayer.h" -#include "gui/confirm_dialog.h" +#include "gui/confirmdialog.h" #include "gui/trade.h" #include "gui/widgets/chattab.h" diff --git a/src/npc.cpp b/src/npc.cpp index 374e7525..40a98ca0 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -25,7 +25,7 @@ #include "particle.h" #include "text.h" -#include "gui/npc_text.h" +#include "gui/npctextdialog.h" #include "gui/palette.h" #include "net/net.h" diff --git a/src/player_relations.cpp b/src/playerrelations.cpp index 898996fa..4a431e2a 100644 --- a/src/player_relations.cpp +++ b/src/playerrelations.cpp @@ -26,7 +26,7 @@ #include "configuration.h" #include "graphics.h" #include "player.h" -#include "player_relations.h" +#include "playerrelations.h" #include "utils/dtor.h" diff --git a/src/player_relations.h b/src/playerrelations.h index adc6a95f..adc6a95f 100644 --- a/src/player_relations.h +++ b/src/playerrelations.h diff --git a/src/position.cpp b/src/position.cpp index 69d50476..33859327 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -29,14 +29,14 @@ std::ostream& operator <<(std::ostream &os, const Position &p) std::ostream& operator <<(std::ostream &os, const Path &path) { - Path::const_iterator i = path.begin(); + Path::const_iterator i = path.begin(), i_end = path.end(); os << "("; - while (i != path.end()) + while (i != i_end) { os << *i; ++i; - if (i != path.end()) + if (i != i_end) os << ", "; } os << ")"; @@ -182,8 +182,8 @@ <Unit filename="src/engine.h" /> <Unit filename="src/equipment.cpp" /> <Unit filename="src/equipment.h" /> - <Unit filename="src/floor_item.cpp" /> - <Unit filename="src/floor_item.h" /> + <Unit filename="src/flooritem.cpp" /> + <Unit filename="src/flooritem.h" /> <Unit filename="src/flooritemmanager.cpp" /> <Unit filename="src/flooritemmanager.h" /> <Unit filename="src/game.cpp" /> @@ -218,14 +218,14 @@ <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> </Unit> - <Unit filename="src/gui/char_select.cpp" /> - <Unit filename="src/gui/char_select.h" /> + <Unit filename="src/gui/charselectdialog.cpp" /> + <Unit filename="src/gui/charselectdialog.h" /> <Unit filename="src/gui/charcreatedialog.cpp" /> <Unit filename="src/gui/charcreatedialog.h" /> <Unit filename="src/gui/chat.cpp" /> <Unit filename="src/gui/chat.h" /> - <Unit filename="src/gui/confirm_dialog.cpp" /> - <Unit filename="src/gui/confirm_dialog.h" /> + <Unit filename="src/gui/confirmdialog.cpp" /> + <Unit filename="src/gui/confirmdialog.h" /> <Unit filename="src/gui/connection.cpp" /> <Unit filename="src/gui/connection.h" /> <Unit filename="src/gui/debugwindow.cpp" /> @@ -262,8 +262,8 @@ <Unit filename="src/gui/help.h" /> <Unit filename="src/gui/inventorywindow.cpp" /> <Unit filename="src/gui/inventorywindow.h" /> - <Unit filename="src/gui/item_amount.cpp" /> - <Unit filename="src/gui/item_amount.h" /> + <Unit filename="src/gui/itemamount.cpp" /> + <Unit filename="src/gui/itemamount.h" /> <Unit filename="src/gui/itemcontainer.cpp" /> <Unit filename="src/gui/itemcontainer.h" /> <Unit filename="src/gui/itemlinkhandler.cpp" /> @@ -289,8 +289,8 @@ <Unit filename="src/gui/minimap.h" /> <Unit filename="src/gui/ministatus.cpp" /> <Unit filename="src/gui/ministatus.h" /> - <Unit filename="src/gui/npc_text.cpp" /> - <Unit filename="src/gui/npc_text.h" /> + <Unit filename="src/gui/npctextdialog.cpp" /> + <Unit filename="src/gui/npctextdialog.h" /> <Unit filename="src/gui/npcintegerdialog.cpp" /> <Unit filename="src/gui/npcintegerdialog.h" /> <Unit filename="src/gui/npclistdialog.cpp" /> @@ -299,8 +299,8 @@ <Unit filename="src/gui/npcpostdialog.h" /> <Unit filename="src/gui/npcstringdialog.cpp" /> <Unit filename="src/gui/npcstringdialog.h" /> - <Unit filename="src/gui/ok_dialog.cpp" /> - <Unit filename="src/gui/ok_dialog.h" /> + <Unit filename="src/gui/okdialog.cpp" /> + <Unit filename="src/gui/okdialog.h" /> <Unit filename="src/gui/palette.cpp" /> <Unit filename="src/gui/palette.h" /> <Unit filename="src/gui/partywindow.cpp" /> @@ -399,8 +399,8 @@ <Unit filename="src/gui/storagewindow.h" /> <Unit filename="src/gui/table.cpp" /> <Unit filename="src/gui/table.h" /> - <Unit filename="src/gui/table_model.cpp" /> - <Unit filename="src/gui/table_model.h" /> + <Unit filename="src/gui/tablemodel.cpp" /> + <Unit filename="src/gui/tablemodel.h" /> <Unit filename="src/gui/textdialog.cpp"> <Option target="TMWServ" /> <Option target="Unix TMWSERV" /> @@ -959,8 +959,8 @@ <Unit filename="src/particleemitterprop.h" /> <Unit filename="src/player.cpp" /> <Unit filename="src/player.h" /> - <Unit filename="src/player_relations.cpp" /> - <Unit filename="src/player_relations.h" /> + <Unit filename="src/playerrelations.cpp" /> + <Unit filename="src/playerrelations.h" /> <Unit filename="src/position.cpp" /> <Unit filename="src/position.h" /> <Unit filename="src/properties.h" /> |