X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.cpp;h=9cdf9eb1ca3a5164dd904b29c2a4b7cc6c6c3c20;hb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;hp=6592a31a52cfd9600d0121a4f26496c34414e75c;hpb=75fca769413e46462a498e27b7eb1c931af13e55;p=lugaru.git

diff --git a/Source/Game.cpp b/Source/Game.cpp
index 6592a31..9cdf9eb 100644
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -26,6 +26,8 @@ int directing;
 float dialoguetime;
 int dialoguegonethrough[20];
 
+std::vector<TextureInfo> Game::textures;
+
 Game::Game()
 {
 	terraintexture = 0;
@@ -84,13 +86,8 @@ Game::Game()
 //	SkyBox skybox;
 
 	cameramode = 0;
-	cameratogglekeydown = 0;
-	chattogglekeydown = 0;
 	olddrawmode = 0;
 	drawmode = 0;
-	drawmodetogglekeydown = 0;
-	explodetogglekeydown = 0;
-	detailtogglekeydown = 0;
 	firstload = 0;
 	oldbutton = 0;
 
@@ -154,10 +151,6 @@ Game::Game()
 //	XYZ cameraloc;
 	cameradist = 0;
 
-	envtogglekeydown = 0;
-	slomotogglekeydown = 0;
-	texturesizetogglekeydown = 0;
-	freezetogglekeydown = 0;
 	drawtoggle = 0;
 
 	editorenabled = 0;
@@ -194,13 +187,9 @@ Game::Game()
 	displayblink = 0;
 	displayselected = 0;
 	consolekeydown = 0;
-	consoletogglekeydown = 0;
 	consoleblinkdelay = 0;
 	consoleblink = 0;
 	consoleselected = 0;
-//	memset(togglekey, 0, sizeof(togglekey));
-//	memset(togglekeydelay, 0, sizeof(togglekeydelay));
-	registernow = 0;
 	autocam = 0;
 
 	crouchkey = 0,jumpkey = 0,forwardkey = 0,chatkey = 0,backkey = 0,leftkey = 0,rightkey = 0,drawkey = 0,throwkey = 0,attackkey = 0;
@@ -254,27 +243,30 @@ void Game::inputText(char* str, int* charselected, int* nb_chars) {
 	switch(evenement.type) {
 		case SDL_KEYDOWN:
 			if(evenement.key.keysym.sym == SDLK_ESCAPE) {
-				for(i=0;i<255;i++){
-					str[i]=' ';
-				}
+				for(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(i=(*charselected)-1;i<255;i++){
+					for(i=(*charselected)-1;i<255;i++)
 						str[i]=str[i+1];
-					}
-					str[255]=' ';
+					str[255]=0;
 					(*charselected)--;
 					(*nb_chars)--;
 				}
 			} else if(evenement.key.keysym.sym==SDLK_DELETE){
-				for(i=(*charselected);i<255;i++){
-					str[i]=str[i+1];
-				}
-				str[255]=' ';
-				(*nb_chars)--;
+				if((*charselected)<(*nb_chars)){
+                    for(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)--;
@@ -283,10 +275,9 @@ void Game::inputText(char* str, int* charselected, int* nb_chars) {
 					(*charselected)++;
 			} else if(evenement.key.keysym.sym==SDLK_RETURN) {
 				waiting=false;
-			} else if((evenement.key.keysym.unicode<127)&&((*nb_chars)<60)&&(evenement.key.keysym.sym!=SDLK_LSHIFT)&&(evenement.key.keysym.sym!=SDLK_RSHIFT)) {
-				for(i=255;i>=(*charselected)+1;i--){
+			} else if(evenement.key.keysym.unicode>=32&&evenement.key.keysym.unicode<127&&(*nb_chars)<60){
+				for(i=255;i>=(*charselected)+1;i--)
 					str[i]=str[i-1];
-				}
 				str[*charselected]=evenement.key.keysym.unicode;
 				(*charselected)++;
 				(*nb_chars)++;