Sorted all source files in folders

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 7369204ebdd1824efb56336d1a7c38e98664bfc2..176d245f5afa2659e296e2fc4abb61a1a671a6e6 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -23,26 +23,26 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "SDL.h"
 
-#include "ImageIO.h"
-
-#include "Terrain.h"
-#include "Skybox.h"
-#include "Skeleton.h"
-#include "Models.h"
-#include "Lights.h"
-#include "Person.h"
-#include "Sprite.h"
-#include "Text.h"
-#include "Objects.h"
-#include "Weapons.h"
-#include "binio.h"
+#include "Animation/Skeleton.h"
+#include "Audio/Sounds.h"
+#include "Environment/Lights.h"
+#include "Environment/Skybox.h"
+#include "Environment/Terrain.h"
+#include "Graphic/gamegl.h"
+#include "Graphic/Models.h"
+#include "Graphic/Sprite.h"
+#include "Graphic/Stereo.h"
+#include "Graphic/Text.h"
+#include "Graphic/Texture.h"
+#include "Objects/Objects.h"
+#include "Objects/Person.h"
+#include "Objects/Weapons.h"
+#include "Thirdparty/optionparser.h"
+#include "User/Account.h"
+#include "Utils/binio.h"
+#include "Utils/ImageIO.h"
+
 #include <fstream>
-#include "gamegl.h"
-#include "Stereo.h"
-#include "Account.h"
-#include "Sounds.h"
-#include "Texture.h"
-#include "optionparser.h"
 
 #define NB_CAMPAIGN_MENU_ITEM 7
 
@@ -76,6 +76,7 @@ extern bool cameramode;
 extern bool firstload;
 
 extern float leveltime;
+extern float wonleveltime;
 extern float loadtime;
 
 extern Model hawk;
@@ -134,7 +135,6 @@ extern int targetlevel;
 extern float changedelay;
 
 extern bool waiting;
-extern Account* accountactive;
 
 extern unsigned short crouchkey, jumpkey, forwardkey, backkey, leftkey, rightkey, drawkey, throwkey, attackkey;
 extern unsigned short consolekey;
@@ -147,11 +147,10 @@ void LoadStuff();
 void LoadScreenTexture();
 void LoadingScreen();
 int DrawGLScene(StereoSide side);
-void LoadMenu();
-void playdialogueboxsound();
+void playdialoguescenesound();
 int findClosestPlayer();
 void Loadlevel(int which);
-void Loadlevel(const char *name);
+void Loadlevel(const std::string& name);
 void Tick();
 void TickOnce();
 void TickOnceAfter();
@@ -161,7 +160,6 @@ int checkcollide(XYZ startpoint, XYZ endpoint);
 int checkcollide(XYZ startpoint, XYZ endpoint, int what);
 
 void fireSound(int sound = fireendsound);
-void setKeySelected();
 
 void inputText(std::string& str, unsigned* charselected);
 void flash(float amount = 1, int delay = 1);
@@ -218,11 +216,11 @@ SDL_bool sdlEventProc(const SDL_Event &e);
 
 
 
-enum  optionIndex { UNKNOWN, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS };
+enum  optionIndex { UNKNOWN, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS, DEVTOOLS };
 /* Number of options + 1 */
-const int commandLineOptionsNumber = 8;
+const int commandLineOptionsNumber = 9;
 
-extern const option::Descriptor usage[12];
+extern const option::Descriptor usage[13];
 
 extern option::Option commandLineOptions[commandLineOptionsNumber];
 extern option::Option* commandLineOptionsBuffer;