Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated CodeLite project, fixed includes

  • Loading branch information...
commit cc7f529e58d082f4e93f393f1500da1cedb5c796 1 parent 3a37b11
@SuperV1234 authored
Showing with 161 additions and 196 deletions.
  1. +4 −4 SSVOpenHexagon.mk
  2. +59 −58 SSVOpenHexagon.project
  3. +2 −2 _RELEASE/config.json
  4. +0 −1  _RELEASE/openhexagon
  5. +1 −1  include/SSVOpenHexagon/Components/CPlayer.h
  6. +9 −9 include/SSVOpenHexagon/Core/HexagonGame.h
  7. +4 −4 include/SSVOpenHexagon/Core/MenuGame.h
  8. +0 −35 include/SSVOpenHexagon/Data/PatternData.h
  9. +6 −6 include/SSVOpenHexagon/Global/Assets.h
  10. +4 −4 include/SSVOpenHexagon/Utils/Utils.h
  11. +5 −5 src/SSVOpenHexagon/Compatibility/Compatibility.cpp
  12. +4 −4 src/SSVOpenHexagon/Components/CPlayer.cpp
  13. +4 −4 src/SSVOpenHexagon/Components/CWall.cpp
  14. +3 −3 src/SSVOpenHexagon/Core/HGGraphics.cpp
  15. +3 −3 src/SSVOpenHexagon/Core/HGProperties.cpp
  16. +3 −3 src/SSVOpenHexagon/Core/HGScripting.cpp
  17. +2 −2 src/SSVOpenHexagon/Core/HGUpdate.cpp
  18. +5 −5 src/SSVOpenHexagon/Core/HexagonGame.cpp
  19. +4 −4 src/SSVOpenHexagon/Core/MenuGame.cpp
  20. +6 −6 src/SSVOpenHexagon/Core/main.cpp
  21. +2 −2 src/SSVOpenHexagon/Data/EventData.cpp
  22. +2 −2 src/SSVOpenHexagon/Data/LevelData.cpp
  23. +4 −4 src/SSVOpenHexagon/Data/MusicData.cpp
  24. +1 −1  src/SSVOpenHexagon/Data/PackData.cpp
  25. +1 −1  src/SSVOpenHexagon/Data/ProfileData.cpp
  26. +3 −3 src/SSVOpenHexagon/Data/StyleData.cpp
  27. +5 −5 src/SSVOpenHexagon/Global/Assets.cpp
  28. +4 −4 src/SSVOpenHexagon/Global/Config.cpp
  29. +4 −4 src/SSVOpenHexagon/Global/Factory.cpp
  30. +4 −4 src/SSVOpenHexagon/Online/Online.cpp
  31. +1 −1  src/SSVOpenHexagon/Utils/FPSWatcher.cpp
  32. +2 −2 src/SSVOpenHexagon/Utils/Utils.cpp
View
8 SSVOpenHexagon.mk
@@ -13,7 +13,7 @@ CurrentFileName :=
CurrentFilePath :=
CurrentFileFullPath :=
User :=vittorio.romeo
-Date :=22/03/2013
+Date :=24/03/2013
CodeLitePath :="C:\Program Files (x86)\CodeLite"
LinkerName :=g++
SharedObjectLinkerName :=g++ -shared -fPIC
@@ -41,9 +41,9 @@ LinkOptions :=
IncludePath := $(IncludeSwitch). $(IncludeSwitch)./include/ $(IncludeSwitch)../SSVStart/include/ $(IncludeSwitch)../SSVUtils/include/ $(IncludeSwitch)../SSVUtilsJson/include/ $(IncludeSwitch)../SSVEntitySystem/include/ $(IncludeSwitch)../SSVLuaWrapper/include/ $(IncludeSwitch)../SSVMenuSystem/include/ $(IncludeSwitch)../SFML/include $(IncludeSwitch)../jsoncpp/include $(IncludeSwitch)C:/lua/include
IncludePCH :=
RcIncludePath :=
-Libs := $(LibrarySwitch)SSVUtils $(LibrarySwitch)SSVUtilsJson $(LibrarySwitch)SSVStart $(LibrarySwitch)SSVEntitySystem $(LibrarySwitch)SSVLuaWrapper $(LibrarySwitch)SSVMenuSystem $(LibrarySwitch)sfml-window $(LibrarySwitch)sfml-graphics $(LibrarySwitch)sfml-system $(LibrarySwitch)sfml-audio $(LibrarySwitch)sfml-network $(LibrarySwitch)lua51
-ArLibs := "SSVUtils" "SSVUtilsJson" "SSVStart" "SSVEntitySystem" "SSVLuaWrapper" "SSVMenuSystem" "sfml-window" "sfml-graphics" "sfml-system" "sfml-audio" "sfml-network" "lua51"
-LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)../SSVUtils/_RELEASE/ $(LibraryPathSwitch)../SSVUtilsJson/_RELEASE/ $(LibraryPathSwitch)../SSVStart/_RELEASE/ $(LibraryPathSwitch)../SSVEntitySystem/_RELEASE/ $(LibraryPathSwitch)../SSVLuaWrapper/_RELEASE/ $(LibraryPathSwitch)../SSVMenuSystem/_RELEASE/ $(LibraryPathSwitch)../SFML/build2/lib/ $(LibraryPathSwitch)c:/lua
+Libs := $(LibrarySwitch)SSVUtils-s $(LibrarySwitch)SSVUtilsJson-s $(LibrarySwitch)SSVStart-s $(LibrarySwitch)SSVEntitySystem-s $(LibrarySwitch)SSVLuaWrapper-s $(LibrarySwitch)SSVMenuSystem-s $(LibrarySwitch)sfml-window $(LibrarySwitch)sfml-graphics $(LibrarySwitch)sfml-system $(LibrarySwitch)sfml-audio $(LibrarySwitch)sfml-network $(LibrarySwitch)lua51 $(LibrarySwitch)json_mingw_libmt
+ArLibs := "SSVUtils-s" "SSVUtilsJson-s" "SSVStart-s" "SSVEntitySystem-s" "SSVLuaWrapper-s" "SSVMenuSystem-s" "sfml-window" "sfml-graphics" "sfml-system" "sfml-audio" "sfml-network" "lua51" "json_mingw_libmt"
+LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)../SSVUtils/lib/ $(LibraryPathSwitch)../SSVUtilsJson/lib/ $(LibraryPathSwitch)../SSVStart/lib/ $(LibraryPathSwitch)../SSVEntitySystem/lib/ $(LibraryPathSwitch)../SSVLuaWrapper/lib/ $(LibraryPathSwitch)../SSVMenuSystem/lib/ $(LibraryPathSwitch)../SFML/build2/lib/ $(LibraryPathSwitch)../lua $(LibraryPathSwitch)../jsoncpp/libs/mingw/
##
## Common variables
View
117 SSVOpenHexagon.project
@@ -26,6 +26,50 @@
<Dependencies/>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
+ <VirtualDirectory Name="src"/>
+ <VirtualDirectory Name="include">
+ <File Name="include/SSVOpenHexagon/Compatibility/Compatibility.h"/>
+ <File Name="include/SSVOpenHexagon/Components/CPlayer.h"/>
+ <File Name="include/SSVOpenHexagon/Components/CWall.h"/>
+ <File Name="include/SSVOpenHexagon/Core/HGStatus.h"/>
+ <File Name="include/SSVOpenHexagon/Core/HexagonGame.h"/>
+ <File Name="include/SSVOpenHexagon/Core/MenuGame.h"/>
+ <File Name="include/SSVOpenHexagon/Data/EventData.h"/>
+ <File Name="include/SSVOpenHexagon/Data/LevelData.h"/>
+ <File Name="include/SSVOpenHexagon/Data/MusicData.h"/>
+ <File Name="include/SSVOpenHexagon/Data/PackData.h"/>
+ <File Name="include/SSVOpenHexagon/Data/ProfileData.h"/>
+ <File Name="include/SSVOpenHexagon/Data/StyleData.h"/>
+ <File Name="include/SSVOpenHexagon/Global/Assets.h"/>
+ <File Name="include/SSVOpenHexagon/Global/Config.h"/>
+ <File Name="include/SSVOpenHexagon/Global/Factory.h"/>
+ <File Name="include/SSVOpenHexagon/Online/Definitions.h"/>
+ <File Name="include/SSVOpenHexagon/Online/Online.h"/>
+ <File Name="include/SSVOpenHexagon/Utils/FPSWatcher.h"/>
+ <File Name="include/SSVOpenHexagon/Utils/Utils.h"/>
+ <File Name="src/SSVOpenHexagon/Compatibility/Compatibility.cpp"/>
+ <File Name="src/SSVOpenHexagon/Components/CPlayer.cpp"/>
+ <File Name="src/SSVOpenHexagon/Components/CWall.cpp"/>
+ <File Name="src/SSVOpenHexagon/Core/HGGraphics.cpp"/>
+ <File Name="src/SSVOpenHexagon/Core/HGProperties.cpp"/>
+ <File Name="src/SSVOpenHexagon/Core/HGScripting.cpp"/>
+ <File Name="src/SSVOpenHexagon/Core/HGUpdate.cpp"/>
+ <File Name="src/SSVOpenHexagon/Core/HexagonGame.cpp"/>
+ <File Name="src/SSVOpenHexagon/Core/MenuGame.cpp"/>
+ <File Name="src/SSVOpenHexagon/Core/main.cpp"/>
+ <File Name="src/SSVOpenHexagon/Data/EventData.cpp"/>
+ <File Name="src/SSVOpenHexagon/Data/LevelData.cpp"/>
+ <File Name="src/SSVOpenHexagon/Data/MusicData.cpp"/>
+ <File Name="src/SSVOpenHexagon/Data/PackData.cpp"/>
+ <File Name="src/SSVOpenHexagon/Data/ProfileData.cpp"/>
+ <File Name="src/SSVOpenHexagon/Data/StyleData.cpp"/>
+ <File Name="src/SSVOpenHexagon/Global/Assets.cpp"/>
+ <File Name="src/SSVOpenHexagon/Global/Config.cpp"/>
+ <File Name="src/SSVOpenHexagon/Global/Factory.cpp"/>
+ <File Name="src/SSVOpenHexagon/Online/Online.cpp"/>
+ <File Name="src/SSVOpenHexagon/Utils/FPSWatcher.cpp"/>
+ <File Name="src/SSVOpenHexagon/Utils/Utils.cpp"/>
+ </VirtualDirectory>
<Settings Type="Executable">
<GlobalSettings>
<Compiler Options="" C_Options="">
@@ -110,26 +154,28 @@
<IncludePath Value="C:/lua/include"/>
</Compiler>
<Linker Options="" Required="yes">
- <LibraryPath Value="../SSVUtils/_RELEASE/"/>
- <LibraryPath Value="../SSVUtilsJson/_RELEASE/"/>
- <LibraryPath Value="../SSVStart/_RELEASE/"/>
- <LibraryPath Value="../SSVEntitySystem/_RELEASE/"/>
- <LibraryPath Value="../SSVLuaWrapper/_RELEASE/"/>
- <LibraryPath Value="../SSVMenuSystem/_RELEASE/"/>
+ <LibraryPath Value="../SSVUtils/lib/"/>
+ <LibraryPath Value="../SSVUtilsJson/lib/"/>
+ <LibraryPath Value="../SSVStart/lib/"/>
+ <LibraryPath Value="../SSVEntitySystem/lib/"/>
+ <LibraryPath Value="../SSVLuaWrapper/lib/"/>
+ <LibraryPath Value="../SSVMenuSystem/lib/"/>
<LibraryPath Value="../SFML/build2/lib/"/>
- <LibraryPath Value="c:/lua"/>
- <Library Value="SSVUtils"/>
- <Library Value="SSVUtilsJson"/>
- <Library Value="SSVStart"/>
- <Library Value="SSVEntitySystem"/>
- <Library Value="SSVLuaWrapper"/>
- <Library Value="SSVMenuSystem"/>
+ <LibraryPath Value="../lua"/>
+ <LibraryPath Value="../jsoncpp/libs/mingw/"/>
+ <Library Value="SSVUtils-s"/>
+ <Library Value="SSVUtilsJson-s"/>
+ <Library Value="SSVStart-s"/>
+ <Library Value="SSVEntitySystem-s"/>
+ <Library Value="SSVLuaWrapper-s"/>
+ <Library Value="SSVMenuSystem-s"/>
<Library Value="sfml-window"/>
<Library Value="sfml-graphics"/>
<Library Value="sfml-system"/>
<Library Value="sfml-audio"/>
<Library Value="sfml-network"/>
<Library Value="lua51"/>
+ <Library Value="json_mingw_libmt"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="./_RELEASE/$(ProjectName).exe" IntermediateDirectory="./_INTERMEDIATE" Command="./$(ProjectName)" CommandArguments="windowed noaudio" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="./_RELEASE/" PauseExecWhenProcTerminates="no"/>
@@ -164,49 +210,4 @@
</Completion>
</Configuration>
</Settings>
- <VirtualDirectory Name="src"/>
- <VirtualDirectory Name="include">
- <File Name="include/SSVOpenHexagon/Compatibility/Compatibility.h"/>
- <File Name="include/SSVOpenHexagon/Components/CPlayer.h"/>
- <File Name="include/SSVOpenHexagon/Components/CWall.h"/>
- <File Name="include/SSVOpenHexagon/Core/HGStatus.h"/>
- <File Name="include/SSVOpenHexagon/Core/HexagonGame.h"/>
- <File Name="include/SSVOpenHexagon/Core/MenuGame.h"/>
- <File Name="include/SSVOpenHexagon/Data/EventData.h"/>
- <File Name="include/SSVOpenHexagon/Data/LevelData.h"/>
- <File Name="include/SSVOpenHexagon/Data/MusicData.h"/>
- <File Name="include/SSVOpenHexagon/Data/PackData.h"/>
- <File Name="include/SSVOpenHexagon/Data/PatternData.h"/>
- <File Name="include/SSVOpenHexagon/Data/ProfileData.h"/>
- <File Name="include/SSVOpenHexagon/Data/StyleData.h"/>
- <File Name="include/SSVOpenHexagon/Global/Assets.h"/>
- <File Name="include/SSVOpenHexagon/Global/Config.h"/>
- <File Name="include/SSVOpenHexagon/Global/Factory.h"/>
- <File Name="include/SSVOpenHexagon/Online/Definitions.h"/>
- <File Name="include/SSVOpenHexagon/Online/Online.h"/>
- <File Name="include/SSVOpenHexagon/Utils/FPSWatcher.h"/>
- <File Name="include/SSVOpenHexagon/Utils/Utils.h"/>
- <File Name="src/SSVOpenHexagon/Compatibility/Compatibility.cpp"/>
- <File Name="src/SSVOpenHexagon/Components/CPlayer.cpp"/>
- <File Name="src/SSVOpenHexagon/Components/CWall.cpp"/>
- <File Name="src/SSVOpenHexagon/Core/HGGraphics.cpp"/>
- <File Name="src/SSVOpenHexagon/Core/HGProperties.cpp"/>
- <File Name="src/SSVOpenHexagon/Core/HGScripting.cpp"/>
- <File Name="src/SSVOpenHexagon/Core/HGUpdate.cpp"/>
- <File Name="src/SSVOpenHexagon/Core/HexagonGame.cpp"/>
- <File Name="src/SSVOpenHexagon/Core/MenuGame.cpp"/>
- <File Name="src/SSVOpenHexagon/Core/main.cpp"/>
- <File Name="src/SSVOpenHexagon/Data/EventData.cpp"/>
- <File Name="src/SSVOpenHexagon/Data/LevelData.cpp"/>
- <File Name="src/SSVOpenHexagon/Data/MusicData.cpp"/>
- <File Name="src/SSVOpenHexagon/Data/PackData.cpp"/>
- <File Name="src/SSVOpenHexagon/Data/ProfileData.cpp"/>
- <File Name="src/SSVOpenHexagon/Data/StyleData.cpp"/>
- <File Name="src/SSVOpenHexagon/Global/Assets.cpp"/>
- <File Name="src/SSVOpenHexagon/Global/Config.cpp"/>
- <File Name="src/SSVOpenHexagon/Global/Factory.cpp"/>
- <File Name="src/SSVOpenHexagon/Online/Online.cpp"/>
- <File Name="src/SSVOpenHexagon/Utils/FPSWatcher.cpp"/>
- <File Name="src/SSVOpenHexagon/Utils/Utils.cpp"/>
- </VirtualDirectory>
</CodeLite_Project>
View
4 _RELEASE/config.json
@@ -35,8 +35,8 @@
"flash_enabled": true,
// Audio options
- "no_sound": false,
- "no_music": false,
+ "no_sound": true,
+ "no_music": true,
"sound_volume": 100,
"music_volume": 75,
View
1  _RELEASE/openhexagon
@@ -1 +0,0 @@
-cd /usr/local/games/SSVOpenHexagon/;./SSVOpenHexagon
View
2  include/SSVOpenHexagon/Components/CPlayer.h
@@ -7,7 +7,7 @@
#include <SFML/Graphics.hpp>
#include <SSVEntitySystem/SSVEntitySystem.h>
-#include "Global/Config.h"
+#include "SSVOpenHexagon/Global/Config.h"
namespace hg
{
View
18 include/SSVOpenHexagon/Core/HexagonGame.h
@@ -15,15 +15,15 @@
#include <SSVUtils/SSVUtils.h>
#include <SSVStart/SSVStart.h>
#include <SSVEntitySystem/SSVEntitySystem.h>
-#include "HGStatus.h"
-#include "Data/LevelData.h"
-#include "Data/MusicData.h"
-#include "Data/EventData.h"
-#include "Data/StyleData.h"
-#include "Global/Assets.h"
-#include "Global/Config.h"
-#include "Global/Factory.h"
-#include "Utils/FPSWatcher.h"
+#include "SSVOpenHexagon/Core/HGStatus.h"
+#include "SSVOpenHexagon/Data/LevelData.h"
+#include "SSVOpenHexagon/Data/MusicData.h"
+#include "SSVOpenHexagon/Data/EventData.h"
+#include "SSVOpenHexagon/Data/StyleData.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Global/Config.h"
+#include "SSVOpenHexagon/Global/Factory.h"
+#include "SSVOpenHexagon/Utils/FPSWatcher.h"
#pragma GCC system_header
#include <SSVLuaWrapper/SSVLuaWrapper.h>
View
8 include/SSVOpenHexagon/Core/MenuGame.h
@@ -9,10 +9,10 @@
#include <SFML/Graphics.hpp>
#include <SSVStart/SSVStart.h>
#include <SSVMenuSystem/SSVMenuSystem.h>
-#include "Data/LevelData.h"
-#include "Data/StyleData.h"
-#include "Global/Assets.h"
-#include "Global/Config.h"
+#include "SSVOpenHexagon/Data/LevelData.h"
+#include "SSVOpenHexagon/Data/StyleData.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Global/Config.h"
namespace hg
{
View
35 include/SSVOpenHexagon/Data/PatternData.h
@@ -1,35 +0,0 @@
-#ifndef PATTERNDATA_H
-#define PATTERNDATA_H
-
-#include <vector>
-#include <functional>
-#include <string>
-#include <map>
-#include <jsoncpp/json.h>
-#include <SSVStart.h>
-
-using namespace std;
-
-namespace hg
-{
- class HexagonGame;
-
- class ScriptData
- {
- private:
- HexagonGame* hgPtr;
- Json::Value root;
- float currentTime{0};
-
- public:
- ScriptData(Json::Value mRoot);
-
- string getId();
-
- void setHexagonGamePtr(HexagonGame* mHgPtr);
-
- void update(float mFrameTime);
- };
-}
-
-#endif // PATTERNDATA_H
View
12 include/SSVOpenHexagon/Global/Assets.h
@@ -8,12 +8,12 @@
#include <string>
#include <SSVStart/SSVStart.h>
#include <SFML/Audio.hpp>
-#include "Data/EventData.h"
-#include "Data/LevelData.h"
-#include "Data/MusicData.h"
-#include "Data/PackData.h"
-#include "Data/ProfileData.h"
-#include "Data/StyleData.h"
+#include "SSVOpenHexagon/Data/EventData.h"
+#include "SSVOpenHexagon/Data/LevelData.h"
+#include "SSVOpenHexagon/Data/MusicData.h"
+#include "SSVOpenHexagon/Data/PackData.h"
+#include "SSVOpenHexagon/Data/ProfileData.h"
+#include "SSVOpenHexagon/Data/StyleData.h"
namespace hg
{
View
8 include/SSVOpenHexagon/Utils/Utils.h
@@ -12,10 +12,10 @@
#include <jsoncpp/reader.h>
#include <SFML/Graphics.hpp>
#include <SSVStart/SSVStart.h>
-#include "Data/LevelData.h"
-#include "Data/ProfileData.h"
-#include "Data/MusicData.h"
-#include "Data/StyleData.h"
+#include "SSVOpenHexagon/Data/LevelData.h"
+#include "SSVOpenHexagon/Data/ProfileData.h"
+#include "SSVOpenHexagon/Data/MusicData.h"
+#include "SSVOpenHexagon/Data/StyleData.h"
namespace hg
{
View
10 src/SSVOpenHexagon/Compatibility/Compatibility.cpp
@@ -3,11 +3,11 @@
#include <SSVUtils/SSVUtils.h>
#include <SSVUtilsJson/SSVUtilsJson.h>
#include <SSVStart/SSVStart.h>
-#include "Compatibility/Compatibility.h"
-#include "Utils/Utils.h"
-#include "Global/Assets.h"
-#include "Online/Online.h"
-#include "Online/Definitions.h"
+#include "SSVOpenHexagon/Compatibility/Compatibility.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Online/Online.h"
+#include "SSVOpenHexagon/Online/Definitions.h"
using namespace std;
using namespace ssvs;
View
8 src/SSVOpenHexagon/Components/CPlayer.cpp
@@ -2,10 +2,10 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "HexagonGame.h"
-#include "Components/CPlayer.h"
-#include "Components/CWall.h"
-#include "Utils/Utils.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
+#include "SSVOpenHexagon/Components/CPlayer.h"
+#include "SSVOpenHexagon/Components/CWall.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
using namespace std;
using namespace sf;
View
8 src/SSVOpenHexagon/Components/CWall.cpp
@@ -2,10 +2,10 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "HexagonGame.h"
-#include "Components/CPlayer.h"
-#include "Components/CWall.h"
-#include "Utils/Utils.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
+#include "SSVOpenHexagon/Components/CPlayer.h"
+#include "SSVOpenHexagon/Components/CWall.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
using namespace sf;
using namespace sses;
View
6 src/SSVOpenHexagon/Core/HGGraphics.cpp
@@ -2,9 +2,9 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "Global/Assets.h"
-#include "Utils/Utils.h"
-#include "HexagonGame.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
using namespace std;
using namespace sf;
View
6 src/SSVOpenHexagon/Core/HGProperties.cpp
@@ -2,9 +2,9 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "Global/Assets.h"
-#include "Utils/Utils.h"
-#include "HexagonGame.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
using namespace std;
using namespace sf;
View
6 src/SSVOpenHexagon/Core/HGScripting.cpp
@@ -4,9 +4,9 @@
#include <fstream>
#include <SSVUtilsJson/SSVUtilsJson.h>
-#include "Global/Assets.h"
-#include "Utils/Utils.h"
-#include "HexagonGame.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
using namespace std;
using namespace sf;
View
4 src/SSVOpenHexagon/Core/HGUpdate.cpp
@@ -4,8 +4,8 @@
#include <SSVUtils/SSVUtils.h>
#include <SSVUtilsJson/SSVUtilsJson.h>
-#include "Utils/Utils.h"
-#include "HexagonGame.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
using namespace std;
using namespace sf;
View
10 src/SSVOpenHexagon/Core/HexagonGame.cpp
@@ -2,11 +2,11 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "Global/Assets.h"
-#include "HexagonGame.h"
-#include "MenuGame.h"
-#include "Online/Online.h"
-#include "Utils/Utils.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
+#include "SSVOpenHexagon/Core/MenuGame.h"
+#include "SSVOpenHexagon/Online/Online.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
using namespace std;
using namespace sf;
View
8 src/SSVOpenHexagon/Core/MenuGame.cpp
@@ -5,10 +5,10 @@
#include <string>
#include <SSVUtils/SSVUtils.h>
#include <SSVUtilsJson/SSVUtilsJson.h>
-#include "Utils/Utils.h"
-#include "HexagonGame.h"
-#include "MenuGame.h"
-#include "Online/Online.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
+#include "SSVOpenHexagon/Core/MenuGame.h"
+#include "SSVOpenHexagon/Online/Online.h"
using namespace std;
using namespace sf;
View
12 src/SSVOpenHexagon/Core/main.cpp
@@ -7,12 +7,12 @@
#include <random>
#include <SSVUtils/SSVUtils.h>
#include <SSVStart/SSVStart.h>
-#include "Online/Online.h"
-#include "HexagonGame.h"
-#include "MenuGame.h"
-#include "Global/Assets.h"
-#include "Global/Config.h"
-#include "Compatibility/Compatibility.h"
+#include "SSVOpenHexagon/Online/Online.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
+#include "SSVOpenHexagon/Core/MenuGame.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Global/Config.h"
+#include "SSVOpenHexagon/Compatibility/Compatibility.h"
using namespace std;
using namespace ssvs;
View
4 src/SSVOpenHexagon/Data/EventData.cpp
@@ -3,8 +3,8 @@
// AFL License page: http://opensource.org/licenses/AFL-3.0
#include <SSVUtilsJson/SSVUtilsJson.h>
-#include "Data/EventData.h"
-#include "HexagonGame.h"
+#include "SSVOpenHexagon/Data/EventData.h"
+#include "SSVOpenHexagon/Core/HexagonGame.h"
using namespace std;
using namespace ssvuj;
View
4 src/SSVOpenHexagon/Data/LevelData.cpp
@@ -4,8 +4,8 @@
#include <SSVUtils/SSVUtils.h>
#include <SSVUtilsJson/SSVUtilsJson.h>
-#include "Data/LevelData.h"
-#include "Utils/Utils.h"
+#include "SSVOpenHexagon/Data/LevelData.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
using namespace std;
using namespace ssvu;
View
8 src/SSVOpenHexagon/Data/MusicData.cpp
@@ -2,10 +2,10 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "Data/MusicData.h"
-#include "Global/Assets.h"
-#include "Utils/Utils.h"
-#include "Global/Config.h"
+#include "SSVOpenHexagon/Data/MusicData.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Global/Config.h"
using namespace std;
using namespace sf;
View
2  src/SSVOpenHexagon/Data/PackData.cpp
@@ -2,7 +2,7 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "PackData.h"
+#include "SSVOpenHexagon/Data/PackData.h"
using namespace std;
View
2  src/SSVOpenHexagon/Data/ProfileData.cpp
@@ -2,7 +2,7 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "Data/ProfileData.h"
+#include "SSVOpenHexagon/Data/ProfileData.h"
using namespace std;
View
6 src/SSVOpenHexagon/Data/StyleData.cpp
@@ -4,9 +4,9 @@
#include <SSVUtils/SSVUtils.h>
#include <SSVUtilsJson/SSVUtilsJson.h>
-#include "Data/StyleData.h"
-#include "Utils/Utils.h"
-#include "Global/Config.h"
+#include "SSVOpenHexagon/Data/StyleData.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Global/Config.h"
using namespace std;
using namespace sf;
View
10 src/SSVOpenHexagon/Global/Assets.cpp
@@ -10,11 +10,11 @@
#include <SFML/Graphics.hpp>
#include <jsoncpp/json.h>
#include <jsoncpp/reader.h>
-#include "Global/Assets.h"
-#include "Global/Config.h"
-#include "Online/Definitions.h"
-#include "Online/Online.h"
-#include "Utils/Utils.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Global/Config.h"
+#include "SSVOpenHexagon/Online/Definitions.h"
+#include "SSVOpenHexagon/Online/Online.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
using namespace std;
using namespace sf;
View
8 src/SSVOpenHexagon/Global/Config.cpp
@@ -8,10 +8,10 @@
#include <jsoncpp/reader.h>
#include <SSVUtils/SSVUtils.h>
#include <SSVUtilsJson/SSVUtilsJson.h>
-#include "Global/Config.h"
-#include "Global/Assets.h"
-#include "Utils/Utils.h"
-#include "Online/Online.h"
+#include "SSVOpenHexagon/Global/Config.h"
+#include "SSVOpenHexagon/Global/Assets.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Online/Online.h"
using namespace std;
using namespace sf;
View
8 src/SSVOpenHexagon/Global/Factory.cpp
@@ -2,10 +2,10 @@
// License: Academic Free License ("AFL") v. 3.0
// AFL License page: http://opensource.org/licenses/AFL-3.0
-#include "Components/CPlayer.h"
-#include "Components/CWall.h"
-#include "Global/Factory.h"
-#include "Utils/Utils.h"
+#include "SSVOpenHexagon/Components/CPlayer.h"
+#include "SSVOpenHexagon/Components/CWall.h"
+#include "SSVOpenHexagon/Global/Factory.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
using namespace sf;
using namespace sses;
View
8 src/SSVOpenHexagon/Online/Online.cpp
@@ -8,10 +8,10 @@
#include <SSVUtils/SSVUtils.h>
#include <SSVUtilsJson/SSVUtilsJson.h>
#include <SSVStart/SSVStart.h>
-#include "Online/Online.h"
-#include "Global/Config.h"
-#include "Online/Definitions.h"
-#include "Utils/Utils.h"
+#include "SSVOpenHexagon/Online/Online.h"
+#include "SSVOpenHexagon/Global/Config.h"
+#include "SSVOpenHexagon/Online/Definitions.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
using namespace std;
using namespace sf;
View
2  src/SSVOpenHexagon/Utils/FPSWatcher.cpp
@@ -4,7 +4,7 @@
#include <SSVUtils/SSVUtils.h>
#include <SFML/System.hpp>
-#include "FPSWatcher.h"
+#include "SSVOpenHexagon/Utils/FPSWatcher.h"
using namespace std;
using namespace sf;
View
4 src/SSVOpenHexagon/Utils/Utils.cpp
@@ -7,8 +7,8 @@
#include <fstream>
#include <SSVUtils/SSVUtils.h>
#include <SSVUtilsJson/SSVUtilsJson.h>
-#include "Utils/Utils.h"
-#include "Global/Config.h"
+#include "SSVOpenHexagon/Utils/Utils.h"
+#include "SSVOpenHexagon/Global/Config.h"
using namespace std;
using namespace sf;
Please sign in to comment.
Something went wrong with that request. Please try again.