diff options
| author | Quentin Bazin <quent42340@gmail.com> | 2018-11-28 20:01:49 +0100 |
|---|---|---|
| committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-11-28 20:01:49 +0100 |
| commit | 5f1cd555cd9d1c64426e173b30b5b792d211c835 (patch) | |
| tree | 2c8508467d3bf28d549cce2d25144fa8ef42beae /src/gui/guiFormSpecMenu.cpp | |
| parent | ddd9317b733857630499972179caebc236b4d991 (diff) | |
| download | minetest-5f1cd555cd9d1c64426e173b30b5b792d211c835.tar.gz minetest-5f1cd555cd9d1c64426e173b30b5b792d211c835.tar.bz2 minetest-5f1cd555cd9d1c64426e173b30b5b792d211c835.zip | |
Move client-specific files to 'src/client' (#7902)
Update Android.mk
Remove 'src/client' from include_directories
Diffstat (limited to 'src/gui/guiFormSpecMenu.cpp')
| -rw-r--r-- | src/gui/guiFormSpecMenu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index f23055821..c52a6ee27 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "guiTable.h" #include "constants.h" #include "gamedef.h" -#include "keycode.h" +#include "client/keycode.h" #include "util/strfnd.h" #include <IGUICheckBox.h> #include <IGUIEditBox.h> @@ -47,13 +47,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mainmenumanager.h" #include "porting.h" #include "settings.h" -#include "client.h" -#include "fontengine.h" +#include "client/client.h" +#include "client/fontengine.h" #include "util/hex.h" #include "util/numeric.h" #include "util/string.h" // for parseColorString() #include "irrlicht_changes/static_text.h" -#include "guiscalingfilter.h" +#include "client/guiscalingfilter.h" #include "guiEditBoxWithScrollbar.h" #include "intlGUIEditBox.h" @@ -673,10 +673,10 @@ void GUIFormSpecMenu::parseBackground(parserData* data, const std::string &eleme pos.Y = stoi(v_pos[1]); //acts as offset clip = true; } - + if (!data->explicit_size && !clip) warningstream << "invalid use of unclipped background without a size[] element" << std::endl; - + m_backgrounds.emplace_back(name, pos, geom, clip); return; |