X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=176d245f5afa2659e296e2fc4abb61a1a671a6e6;hb=b84825978803615f45a9f128232e62431042aec0;hp=b5a16c6bf2fec9b1e04381f8e381d3fda424ae87;hpb=ad46a578f2879eef5c1ee922ab22922e1f7988f2;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index b5a16c6..176d245 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -23,25 +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"
 
 #define NB_CAMPAIGN_MENU_ITEM 7
 
@@ -75,6 +76,7 @@ extern bool cameramode;
 extern bool firstload;
 
 extern float leveltime;
+extern float wonleveltime;
 extern float loadtime;
 
 extern Model hawk;
@@ -133,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;
@@ -146,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();
@@ -160,10 +160,9 @@ 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();
+void flash(float amount = 1, int delay = 1);
 }
 
 #ifndef __forceinline
@@ -192,30 +191,6 @@ extern "C" {
 #define STUBBED(x) { static bool seen = false; if (!seen) { seen = true; fprintf(stderr, "STUBBED: %s at %s:%d\n", x, __FILE__, __LINE__); } }
 //#define STUBBED(x)
 
-extern int numdialogues;
-const int max_dialogues = 20;
-const int max_dialoguelength = 20;
-extern int numdialogueboxes[max_dialogues];
-extern int dialoguetype[max_dialogues];
-extern int dialogueboxlocation[max_dialogues][max_dialoguelength];
-extern float dialogueboxcolor[max_dialogues][max_dialoguelength][3];
-extern int dialogueboxsound[max_dialogues][max_dialoguelength];
-extern char dialoguetext[max_dialogues][max_dialoguelength][128];
-extern char dialoguename[max_dialogues][max_dialoguelength][64];
-extern XYZ dialoguecamera[max_dialogues][max_dialoguelength];
-extern XYZ participantlocation[max_dialogues][10];
-extern int participantfocus[max_dialogues][max_dialoguelength];
-extern int participantaction[max_dialogues][max_dialoguelength];
-extern float participantyaw[max_dialogues][10];
-extern XYZ participantfacing[max_dialogues][max_dialoguelength][10];
-extern float dialoguecamerayaw[max_dialogues][max_dialoguelength];
-extern float dialoguecamerapitch[max_dialogues][max_dialoguelength];
-extern int indialogue;
-extern int whichdialogue;
-extern int directing;
-extern float dialoguetime;
-extern int dialoguegonethrough[20];
-
 enum maptypes {
     mapkilleveryone, mapgosomewhere,
     mapkillsomeone, mapkillmost // These two are unused
@@ -240,4 +215,14 @@ extern const char **creatureskin[2];
 SDL_bool sdlEventProc(const SDL_Event &e);
 
 
+
+enum  optionIndex { UNKNOWN, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS, DEVTOOLS };
+/* Number of options + 1 */
+const int commandLineOptionsNumber = 9;
+
+extern const option::Descriptor usage[13];
+
+extern option::Option commandLineOptions[commandLineOptionsNumber];
+extern option::Option* commandLineOptionsBuffer;
+
 #endif