minetest-stuffs/dragonfire-client-dragonfire
1
0
Fork 0
Code Issues 10 Pull Requests 2 Packages Projects Releases 3 Wiki Activity

Move client-specific files to 'src/client' (#7902)

Browse Source 
Update Android.mk
Remove 'src/client' from include_directories
This commit is contained in:
Quentin Bazin
2018-11-28 20:01:49 +01:00
committed by SmallJoker
parent ddd9317b73
commit 5f1cd555cd
85 changed files with 187 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/guiChatConsole.cpp
View File

@@ -19,14 +19,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "guiChatConsole.h"
#include "chat.h"
#include "client.h"
#include "client/client.h"
#include "debug.h"
#include "gettime.h"
#include "keycode.h"
#include "client/keycode.h"
#include "settings.h"
#include "porting.h"
#include "client/tile.h"
#include "fontengine.h"
#include "client/fontengine.h"
#include "log.h"
#include "gettext.h"
#include <string>

2
src/gui/guiConfirmRegistration.cpp
View File

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "guiConfirmRegistration.h"
#include "client.h"
#include "client/client.h"
#include <IGUICheckBox.h>
#include <IGUIButton.h>
#include <IGUIStaticText.h>

6
src/gui/guiEngine.cpp
View File

@@ -32,11 +32,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "guiMainMenu.h"
#include "sound.h"
#include "client/sound_openal.h"
#include "clouds.h"
#include "client/clouds.h"
#include "httpfetch.h"
#include "log.h"
#include "fontengine.h"
#include "guiscalingfilter.h"
#include "client/fontengine.h"
#include "client/guiscalingfilter.h"
#include "irrlicht_changes/static_text.h"
#ifdef __ANDROID__

12
src/gui/guiFormSpecMenu.cpp
View File

@@ -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;

2
src/gui/guiKeyChangeMenu.h
View File

@@ -24,7 +24,7 @@
#include "irrlichttypes_extrabloated.h"
#include "modalMenu.h"
#include "gettext.h"
#include "keycode.h"
#include "client/keycode.h"
#include <string>
#include <vector>

2
src/gui/guiPasswordChange.cpp
View File

@@ -17,7 +17,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "guiPasswordChange.h"
#include "client.h"
#include "client/client.h"
#include <IGUICheckBox.h>
#include <IGUIEditBox.h>
#include <IGUIButton.h>

2
src/gui/guiTable.cpp
View File

@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/string.h" // for parseColorString()
#include "settings.h" // for settings
#include "porting.h" // for dpi
#include "guiscalingfilter.h"
#include "client/guiscalingfilter.h"
/*
GUITable