diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-13 22:45:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-13 22:45:52 +0300 |
| commit | ac3ccda23ac4b5c69e15147b8082d90df2ac23de (patch) | |
| tree | 593f2899e1891d8c5a6af47349570fb793e7ff79 /src/gui | |
| parent | 6849c5919c02b4cf97de91c801b542e36eb089ce (diff) | |
| download | manaverse-ac3ccda23ac4b5c69e15147b8082d90df2ac23de.tar.gz manaverse-ac3ccda23ac4b5c69e15147b8082d90df2ac23de.tar.bz2 manaverse-ac3ccda23ac4b5c69e15147b8082d90df2ac23de.tar.xz manaverse-ac3ccda23ac4b5c69e15147b8082d90df2ac23de.zip | |
Move spells and graphics related constants into separate files.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 2 | ||||
| -rw-r--r-- | src/gui/viewport.h | 3 | ||||
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/spellshortcutcontainer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windowmanager.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 1 |
6 files changed, 10 insertions, 3 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 10712d354..cc1cf0726 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -34,6 +34,8 @@ #include "being/playerrelation.h" #include "being/playerrelations.h" +#include "const/spells.h" + #include "enums/resources/map/mapitemtype.h" #include "input/inputmanager.h" diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 61fb87c02..a3434b00d 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -43,9 +43,6 @@ class Graphics; class Map; class MapItem; -/** Delay between two mouse calls when dragging mouse and move the player */ -const int walkingMouseDelay = 500; - /** * The viewport on the map. Displays the current map and handles mouse input * and the popup menu. diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index e1f6bafee..4e14fa8c5 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -25,10 +25,13 @@ #include "dragdrop.h" #include "itemshortcut.h" #include "settings.h" +#include "spellmanager.h" #include "spellshortcut.h" #include "being/playerinfo.h" +#include "const/spells.h" + #include "input/inputmanager.h" #include "gui/viewport.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 5a3a568f8..c5ef083b0 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -25,8 +25,11 @@ #include "dragdrop.h" #include "itemshortcut.h" #include "settings.h" +#include "spellmanager.h" #include "spellshortcut.h" +#include "const/spells.h" + #include "gui/viewport.h" #include "gui/fonts/font.h" diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index 72cc677e8..4be7c3600 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -26,6 +26,7 @@ #include "configuration.h" #include "game.h" #include "settings.h" +#include "spellmanager.h" #include "spellshortcut.h" #include "touchmanager.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 713db36fa..c08454623 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -27,6 +27,7 @@ #include "guild.h" #include "party.h" #include "settings.h" +#include "spellmanager.h" #include "spellshortcut.h" #include "being/localplayer.h" |