X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=b5a16c6bf2fec9b1e04381f8e381d3fda424ae87;hb=94df0906c159318cb39bb4ee063336ba3cf51ccb;hp=eb07d20c8ce7b9ddb9ef49a8b51f3cc1fc0c9f9e;hpb=24004d6ab1e68faaf85ece11b566449997da5013;p=lugaru.git
diff --git a/Source/Game.h b/Source/Game.h
index eb07d20..b5a16c6 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -1,22 +1,21 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+along with Lugaru. If not, see .
*/
#ifndef _GAME_H_
@@ -24,21 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "SDL.h"
-#if (defined(__APPLE__) && defined(__MACH__))
-# ifdef PLATFORM_MACOSX
-# error Do not define PLATFORM_MACOSX for new builds. It is for the old Carbonized build.
-# endif
-#endif
-
-#ifdef PLATFORM_MACOSX
-#include
-#include "Quicktime.h"
-#endif
-
-//Jordan included glut.h
-//#include
-
-#include "TGALoader.h"
+#include "ImageIO.h"
#include "Terrain.h"
#include "Skybox.h"
@@ -47,10 +32,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "Lights.h"
#include "Person.h"
#include "Sprite.h"
-//#include
#include "Text.h"
#include "Objects.h"
-//#include
#include "Weapons.h"
#include "binio.h"
#include
@@ -135,18 +118,15 @@ extern bool scoreadded;
extern int numchallengelevels;
extern bool console;
-extern char consoletext[15][256];
-extern int consolechars[15];
-extern bool chatting;
-extern char displaytext[15][256];
-extern int displaychars[15];
+extern std::string consoletext[15];
+extern std::string displaytext[15];
extern float displaytime[15];
extern float displayblinkdelay;
extern bool displayblink;
-extern int displayselected;
+extern unsigned displayselected;
extern float consoleblinkdelay;
extern bool consoleblink;
-extern int consoleselected;
+extern unsigned consoleselected;
extern int oldenvironment;
extern int targetlevel;
@@ -155,7 +135,7 @@ extern float changedelay;
extern bool waiting;
extern Account* accountactive;
-extern unsigned short crouchkey, jumpkey, forwardkey, chatkey, backkey, leftkey, rightkey, drawkey, throwkey, attackkey;
+extern unsigned short crouchkey, jumpkey, forwardkey, backkey, leftkey, rightkey, drawkey, throwkey, attackkey;
extern unsigned short consolekey;
void newGame();
@@ -167,6 +147,10 @@ void LoadScreenTexture();
void LoadingScreen();
int DrawGLScene(StereoSide side);
void LoadMenu();
+void playdialogueboxsound();
+int findClosestPlayer();
+void Loadlevel(int which);
+void Loadlevel(const char *name);
void Tick();
void TickOnce();
void TickOnceAfter();
@@ -178,7 +162,7 @@ int checkcollide(XYZ startpoint, XYZ endpoint, int what);
void fireSound(int sound = fireendsound);
void setKeySelected();
-void inputText(char* str, int* charselected, int* nb_chars);
+void inputText(std::string& str, unsigned* charselected);
void flash();
}
@@ -190,7 +174,15 @@ void flash();
static __forceinline void swap_gl_buffers(void)
{
- SDL_GL_SwapBuffers();
+ extern SDL_Window *sdlwindow;
+ SDL_GL_SwapWindow(sdlwindow);
+
+ // try to limit this to 60fps, even if vsync fails.
+ Uint32 now;
+ static Uint32 frameticks = 0;
+ const Uint32 endticks = (frameticks + 16);
+ while ((now = SDL_GetTicks()) < endticks) { /* spin. */ }
+ frameticks = now;
}
extern "C" {
@@ -200,8 +192,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 numplayers;
-
extern int numdialogues;
const int max_dialogues = 20;
const int max_dialoguelength = 20;
@@ -233,15 +223,21 @@ enum maptypes {
enum pathtypes {wpkeepwalking, wppause};
-static const char *pathtypenames[] = {"keepwalking", "pause"};
+extern const char *pathtypenames[2];
enum editortypes {typeactive, typesitting, typesittingwall, typesleeping,
typedead1, typedead2, typedead3, typedead4
};
-static const char *editortypenames[] = {
- "active", "sitting", "sitting wall", "sleeping",
- "dead1", "dead2", "dead3", "dead4"
-};
+extern const char *editortypenames[8];
+
+extern const char *rabbitskin[10];
+
+extern const char *wolfskin[3];
+
+extern const char **creatureskin[2];
+
+SDL_bool sdlEventProc(const SDL_Event &e);
+
#endif