X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.cpp;h=54b4f2f6907d11bc702ef2e972d2e602ad7ed433;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hp=44c4e649526c530a4160ae2f93542b91a2f140bb;hpb=531512ddd1b17458281b27a6f21be83bc2a9c16c;p=lugaru.git

diff --git a/Source/Game.cpp b/Source/Game.cpp
index 44c4e64..54b4f2f 100644
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -1,485 +1,193 @@
-#include "Game.h"
-#include "openal_wrapper.h"
-#include "SDL_thread.h"
-
-extern int mainmenu;
-
-int numdialogues;
-int numdialogueboxes[max_dialogues];
-int dialoguetype[max_dialogues];
-int dialogueboxlocation[max_dialogues][max_dialoguelength];
-float dialogueboxcolor[max_dialogues][max_dialoguelength][3];
-int dialogueboxsound[max_dialogues][max_dialoguelength];
-char dialoguetext[max_dialogues][max_dialoguelength][128];
-char dialoguename[max_dialogues][max_dialoguelength][64];
-XYZ dialoguecamera[max_dialogues][max_dialoguelength];
-XYZ participantlocation[max_dialogues][10];
-int participantfocus[max_dialogues][max_dialoguelength];
-int participantaction[max_dialogues][max_dialoguelength];
-float participantrotation[max_dialogues][10];
-XYZ participantfacing[max_dialogues][max_dialoguelength][10];
-float dialoguecamerarotation[max_dialogues][max_dialoguelength];
-float dialoguecamerarotation2[max_dialogues][max_dialoguelength];
-int indialogue;
-int whichdialogue;
-int directing;
-float dialoguetime;
-int dialoguegonethrough[20];
-
-namespace Game{
-    GLuint terraintexture;
-    GLuint terraintexture2;
-    GLuint terraintexture3;
-    GLuint screentexture;
-    GLuint screentexture2;
-    GLuint logotexture;
-    GLuint loadscreentexture;
-    GLuint Maparrowtexture;
-    GLuint Mapboxtexture;
-    GLuint Mapcircletexture;
-    GLuint cursortexture;
-    GLuint Mainmenuitems[10];
-
-    int selected;
-    int keyselect;
-    int indemo;
-
-    bool won;
-
-    bool entername;
-
-    char registrationname[256];
-    float registrationnumber;
-
-    int newdetail;
-    int newscreenwidth;
-    int newscreenheight;
-
-    bool gameon;
-    float deltah,deltav;
-    int mousecoordh,mousecoordv;
-    int oldmousecoordh,oldmousecoordv;
-    float rotation,rotation2;
-    SkyBox skybox;
-    bool cameramode;
-    int olddrawmode;
-    int drawmode;
-    bool firstload;
-    bool oldbutton;
-
-    float leveltime;
-    float loadtime;
-
-    Model hawk;
-    XYZ hawkcoords;
-    XYZ realhawkcoords;
-    GLuint hawktexture;
-    float hawkrotation;
-    float hawkcalldelay;
-
-    Model eye;
-    Model iris;
-    Model cornea;
-
-    bool stealthloading;
-
-    std::vector<CampaignLevel> campaignlevels;
-    int whichchoice;
-    int actuallevel;
-    bool winhotspot;
-    bool windialogue;
-
-    bool minimap;
-
-    int musictype,oldmusictype,oldoldmusictype;
-    bool realthreat;
-
-    Model rabbit;
-    XYZ rabbitcoords;
-
-    XYZ mapcenter;
-    float mapradius;
-
-    Text* text;
-    float fps;
-
-    XYZ cameraloc;
-    float cameradist;
-
-    int drawtoggle;
-
-    bool editorenabled;
-    int editortype;
-    float editorsize;
-    float editorrotation;
-    float editorrotation2;
-
-    float brightness;
-
-    int quit;
-    int tryquit;
-
-    XYZ pathpoint[30];
-    int numpathpoints;
-    int numpathpointconnect[30];
-    int pathpointconnect[30][30];
-    int pathpointselected;
-
-    int endgame;
-    bool scoreadded;
-    int numchallengelevels;
-
-    bool console;
-    int archiveselected;
-    char consoletext[15][256];
-    int consolechars[15];
-    bool chatting;
-    char displaytext[15][256];
-    int displaychars[15];
-    float displaytime[15];
-    float displayblinkdelay;
-    bool displayblink;
-    int displayselected;
-    bool consolekeydown;
-    float consoleblinkdelay;
-    bool consoleblink;
-    int consoleselected;
-    bool autocam;
-
-    unsigned short crouchkey,jumpkey,forwardkey,chatkey,backkey,leftkey,rightkey,drawkey,throwkey,attackkey;
-    unsigned short consolekey;
-    bool oldattackkey;
-
-    int loading;
-    float talkdelay;
-    
-    int numboundaries;
-    XYZ boundary[360];
-
-    int whichlevel;
-    int oldenvironment;
-    int targetlevel;
-    float changedelay;
-
-    float musicvolume[4];
-    float oldmusicvolume[4];
-    int musicselected;
-    int change;
-
-    bool waiting;
-    Account* accountactive;
-}
-
-void Game::newGame()
-{
-    text=NULL;
-    text=new Text();
-
-	terraintexture = 0;
-	terraintexture2 = 0;
-	terraintexture3 = 0;
-	screentexture = 0;
-	screentexture2 = 0;
-	logotexture = 0;
-	loadscreentexture = 0;
-	Maparrowtexture = 0;
-	Mapboxtexture = 0;
-	Mapcircletexture = 0;
-	cursortexture = 0;
-
-	memset(Mainmenuitems, 0, sizeof(Mainmenuitems));
-
-	selected = 0;
-	keyselect = 0;
-	indemo = 0;
-
-	won = 0;
-
-	entername = 0;
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
-	memset(registrationname, 0, sizeof(registrationname));
-	registrationnumber = 0;
+This file is part of Lugaru.
 
-	newdetail = 0;
-	newscreenwidth = 0;
-	newscreenheight = 0;
+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.
 
-	gameon = 0;
-	deltah = 0,deltav = 0;
-	mousecoordh = 0,mousecoordv = 0;
-	oldmousecoordh = 0,oldmousecoordv = 0;
-	rotation = 0,rotation2 = 0;
+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.
 
-//	SkyBox skybox;
+You should have received a copy of the GNU General Public License
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-	cameramode = 0;
-	olddrawmode = 0;
-	drawmode = 0;
-	firstload = 0;
-	oldbutton = 0;
+#include "Game.hpp"
 
-	leveltime = 0;
-	loadtime = 0;
+#include "Audio/openal_wrapper.hpp"
+#include "Level/Dialog.hpp"
 
-//	Model hawk;
+#include <SDL_thread.h>
 
-//	XYZ hawkcoords;
-//	XYZ realhawkcoords;
+extern int mainmenu;
 
-	hawktexture = 0;
-	hawkrotation = 0;
-	hawkcalldelay = 0;
-/*
-	Model eye;
-	Model iris;
-	Model cornea;
-*/
-	stealthloading = 0;
-
-	whichchoice = 0;
-	actuallevel = 0;
-	winhotspot = false;
-	windialogue = false;
-
-	minimap = 0;
-
-	musictype = 0,oldmusictype = 0,oldoldmusictype = 0;
-	realthreat = 0;
-
-//	Model rabbit;
-//	XYZ rabbitcoords;
-
-//	XYZ mapcenter;
-	mapradius = 0;
-
-//	Text text;
-	fps = 0;
-
-//	XYZ cameraloc;
-	cameradist = 0;
-
-	drawtoggle = 0;
-
-	editorenabled = 0;
-	editortype = 0;
-	editorsize = 0;
-	editorrotation = 0;
-	editorrotation2 = 0;
-
-	brightness = 0;
-
-	quit = 0;
-	tryquit = 0;
-
-//	XYZ pathpoint[30];
-	numpathpoints = 0;
-	memset(numpathpointconnect, 0, sizeof(numpathpointconnect));
-	memset(pathpointconnect, 0, sizeof(pathpointconnect));
-	pathpointselected = 0;
-
-	endgame = 0;
-	scoreadded = 0;
-	numchallengelevels = 0;
-
-	console = false;
-	archiveselected = 0;
-
-	memset(consoletext, 0, sizeof(consoletext));
-	memset(consolechars, 0, sizeof(consolechars));
-	chatting = 0;
-	memset(displaytext, 0, sizeof(displaytext));
-	memset(displaychars, 0, sizeof(displaychars));
-	memset(displaytime, 0, sizeof(displaytime));
-	displayblinkdelay = 0;
-	displayblink = 0;
-	displayselected = 0;
-	consolekeydown = 0;
-	consoleblinkdelay = 0;
-	consoleblink = 0;
-	consoleselected = 0;
-	autocam = 0;
-
-	crouchkey = 0,jumpkey = 0,forwardkey = 0,chatkey = 0,backkey = 0,leftkey = 0,rightkey = 0,drawkey = 0,throwkey = 0,attackkey = 0;
-	consolekey = 0;
-	oldattackkey = 0;
-
-	loading = 0;
-	talkdelay = 0;
-
-	numboundaries = 0;
-//	XYZ boundary[360];
-
-	whichlevel = 0;
-	oldenvironment = 0;
-	targetlevel = 0;
-	changedelay = 0;
-
-	memset(musicvolume, 0, sizeof(musicvolume));
-	memset(oldmusicvolume, 0, sizeof(oldmusicvolume));
-	musicselected = 0;
-	change = 0;
-	
-//------------
-
-	waiting = false;
-	mainmenu = 0;
-	
-	accountactive = NULL;
-}
+const char* pathtypenames[] = { "keepwalking", "pause" };
+const char* editortypenames[] = {
+    "active", "sitting", "sitting wall", "sleeping",
+    "dead1", "dead2", "dead3", "dead4"
+};
 
-void Game::deleteGame(){
-    if(text)
-        delete text;
-    for(int i=0;i<10;i++){
-        if(Mainmenuitems[i])glDeleteTextures( 1, &Mainmenuitems[i] );
-    }
-    glDeleteTextures( 1, &cursortexture );
-    glDeleteTextures( 1, &Maparrowtexture );
-    glDeleteTextures( 1, &Mapboxtexture );
-    glDeleteTextures( 1, &Mapcircletexture );
-    glDeleteTextures( 1, &terraintexture );
-    glDeleteTextures( 1, &terraintexture2 );
-    if(screentexture>0)glDeleteTextures( 1, &screentexture );
-    if(screentexture2>0)glDeleteTextures( 1, &screentexture2 );
-    glDeleteTextures( 1, &hawktexture );
-    glDeleteTextures( 1, &logotexture );
-    glDeleteTextures( 1, &loadscreentexture );
-
-    Dispose();
+namespace Game
+{
+Texture terraintexture;
+Texture terraintexture2;
+Texture loadscreentexture;
+Texture Maparrowtexture;
+Texture Mapboxtexture;
+Texture Mapcircletexture;
+Texture cursortexture;
+GLuint screentexture = 0;
+GLuint screentexture2 = 0;
+Texture Mainmenuitems[10];
+
+int selected = 0;
+int keyselect = 0;
+
+int newdetail = 0;
+int newscreenwidth = 0;
+int newscreenheight = 0;
+
+bool gameon = 0;
+float deltah = 0;
+float deltav = 0;
+int mousecoordh = 0;
+int mousecoordv = 0;
+int oldmousecoordh = 0;
+int oldmousecoordv = 0;
+float yaw = 0;
+float pitch = 0;
+SkyBox* skybox = NULL;
+bool cameramode = 0;
+bool firstLoadDone = false;
+
+Texture hawktexture;
+float hawkyaw = 0;
+float hawkcalldelay = 0;
+
+float leveltime = 0;
+float wonleveltime = 0;
+float loadtime = 0;
+
+Model hawk;
+XYZ hawkcoords;
+XYZ realhawkcoords;
+
+Model eye;
+Model iris;
+Model cornea;
+
+bool stealthloading = 0;
+
+int musictype = 0;
+
+XYZ mapcenter;
+float mapradius = 0;
+
+Text* text = NULL;
+Text* textmono = NULL;
+float fps = 0;
+
+bool editorenabled = 0;
+int editortype = 0;
+float editorsize = 0;
+float editoryaw = 0;
+float editorpitch = 0;
+
+int tryquit = 0;
+
+XYZ pathpoint[30];
+int numpathpoints = 0;
+int numpathpointconnect[30] = {};
+int pathpointconnect[30][30] = {};
+int pathpointselected = 0;
+
+int endgame = 0;
+bool scoreadded = 0;
+int numchallengelevels = 0;
+
+bool console = false;
+std::string consoletext[15] = {};
+float consoleblinkdelay = 0;
+bool consoleblink = 0;
+unsigned consoleselected = 0;
+
+unsigned short crouchkey = 0, jumpkey = 0, forwardkey = 0, backkey = 0, leftkey = 0, rightkey = 0, drawkey = 0, throwkey = 0, attackkey = 0;
+unsigned short consolekey = 0;
+
+int loading = 0;
+
+int oldenvironment = 0;
+int targetlevel = 0;
+float changedelay = 0;
+
+bool waiting = false;
 }
 
-void Game::fireSound(int sound) {
-	emit_sound_at(sound);
+void Game::fireSound(int sound)
+{
+    emit_sound_at(sound);
 }
 
-void Game::inputText(char* str, int* charselected, int* nb_chars) {
-	SDL_Event evenement;
-	
-	if(!waiting) {
-		waiting=true;
-		SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY,SDL_DEFAULT_REPEAT_INTERVAL);
-		SDL_EnableUNICODE(true);
-	}
-
-	while(SDL_PollEvent(&evenement)) {
-	
-		switch(evenement.type) {
-			case SDL_KEYDOWN:
-				if(evenement.key.keysym.sym == SDLK_ESCAPE) {
-					for(int i=0;i<255;i++)
-						str[i]=0;
-					*nb_chars=0;
-					*charselected=0;
-					waiting=false;
-				} else if(evenement.key.keysym.sym==SDLK_BACKSPACE){
-					if((*charselected)!=0) {
-						for(int i=(*charselected)-1;i<255;i++)
-							str[i]=str[i+1];
-						str[255]=0;
-						(*charselected)--;
-						(*nb_chars)--;
-					}
-				} else if(evenement.key.keysym.sym==SDLK_DELETE){
-					if((*charselected)<(*nb_chars)){
-						for(int i=(*charselected);i<255;i++)
-							str[i]=str[i+1];
-						str[255]=0;
-						(*nb_chars)--;
-					}
-				} else if(evenement.key.keysym.sym==SDLK_HOME){
-					(*charselected)=0;
-				} else if(evenement.key.keysym.sym==SDLK_END){
-					(*charselected)=(*nb_chars);
-				} else if(evenement.key.keysym.sym==SDLK_LEFT){
-					if((*charselected)!=0)
-						(*charselected)--;
-				} else if(evenement.key.keysym.sym==SDLK_RIGHT){
-					if((*charselected)<(*nb_chars))
-						(*charselected)++;
-				} else if(evenement.key.keysym.sym==SDLK_RETURN) {
-					waiting=false;
-				} else if(evenement.key.keysym.unicode>=32&&evenement.key.keysym.unicode<127&&(*nb_chars)<60){
-					for(int i=255;i>=(*charselected)+1;i--)
-						str[i]=str[i-1];
-					str[*charselected]=evenement.key.keysym.unicode;
-					(*charselected)++;
-					(*nb_chars)++;
-				}
-			break;
-		}
-	}
-	
-	if(!waiting) {
-		SDL_EnableKeyRepeat(0,0); // disable key repeat
-		SDL_EnableUNICODE(false);
-	}
-}
+void Game::inputText(string& str, unsigned* charselected)
+{
+    SDL_Event evenement;
 
-void Game::setKeySelected() {
-	waiting=true;
-    printf("launch thread\n");
-	SDL_Thread* thread = SDL_CreateThread(Game::setKeySelected_thread,NULL);
-    if ( thread == NULL ) {
-        fprintf(stderr, "Unable to create thread: %s\n", SDL_GetError());
-		waiting=false;
-        return;
+    if (!waiting) {
+        SDL_StartTextInput();
+        waiting = true;
     }
-}
 
-int Game::setKeySelected_thread(void* data) {
-	int keycode=-1;
-	SDL_Event evenement;
-	while(keycode==-1) {
-		SDL_WaitEvent(&evenement);
-		switch(evenement.type) {
-			case SDL_KEYDOWN:
-				keycode = evenement.key.keysym.sym;
-			break;
-			case SDL_MOUSEBUTTONDOWN:
-				keycode = SDLK_LAST+evenement.button.button;
-			break;
-			default:
-			break;
-		}
-	}
-	if(keycode != SDLK_ESCAPE) {
-		fireSound();
-		switch(keyselect) {
-			case 0: forwardkey=keycode;
-			break;
-			case 1: backkey=keycode;
-			break;
-			case 2: leftkey=keycode;
-			break;
-			case 3: rightkey=keycode;
-			break;
-			case 4: crouchkey=keycode;
-			break;
-			case 5: jumpkey=keycode;
-			break;
-			case 6: drawkey=keycode;
-			break;
-			case 7: throwkey=keycode;
-			break;
-			case 8: attackkey=keycode;
-			break;
-			case 9: consolekey=keycode;
-			break;
-			default:
-			break;
-		}
-	}
-	keyselect=-1;
-	waiting=false;
-    LoadMenu();
-    return 0;
-}
+    while (SDL_PollEvent(&evenement)) {
+        if (!sdlEventProc(evenement)) {
+            tryquit = 1;
+            break;
+        }
+        switch (evenement.type) {
+            case SDL_TEXTEDITING:
+                /* FIXME - We should handle this for complete input method support */
+                break;
+            case SDL_TEXTINPUT:
+                str.insert(*charselected, evenement.text.text);
+                (*charselected) += strlen(evenement.text.text);
+                break;
+            case SDL_KEYDOWN:
+                if (evenement.key.keysym.sym == SDLK_ESCAPE) {
+                    str.clear();
+                    *charselected = 0;
+                    waiting = false;
+                } else if (evenement.key.keysym.sym == SDLK_BACKSPACE) {
+                    if ((*charselected) > 0) {
+                        (*charselected)--;
+                        str.erase(*charselected, 1);
+                    }
+                } else if (evenement.key.keysym.sym == SDLK_DELETE) {
+                    if ((*charselected) < str.size()) {
+                        str.erase(*charselected, 1);
+                    }
+                } else if (evenement.key.keysym.sym == SDLK_HOME) {
+                    (*charselected) = 0;
+                } else if (evenement.key.keysym.sym == SDLK_END) {
+                    (*charselected) = str.size();
+                } else if (evenement.key.keysym.sym == SDLK_LEFT) {
+                    if ((*charselected) != 0)
+                        (*charselected)--;
+                } else if (evenement.key.keysym.sym == SDLK_RIGHT) {
+                    if ((*charselected) < str.size())
+                        (*charselected)++;
+                } else if (evenement.key.keysym.sym == SDLK_RETURN) {
+                    waiting = false;
+                }
+                break;
+        }
+    }
 
-void Game::DrawGL() {
-	if ( stereomode == stereoNone ) {
-		DrawGLScene(stereoCenter);
-	} else {
-		DrawGLScene(stereoLeft);
-		DrawGLScene(stereoRight);
-	}
+    if (!waiting) {
+        SDL_StopTextInput();
+    }
 }