X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=65780a0846643a2b98eaeec28519d8005ef5b0f2;hb=9ecb4e37407173333b466b42276a1764589505f0;hp=2a9a405aba8c73f66a0af072d99fb39653c2658b;hpb=752c53b75078777dde112ebc552c860d8b7cfc28;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 2a9a405..65780a0 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -135,12 +135,12 @@ void Game::Dispose()
 }
 
 
-void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha){
+void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha) {
     textures.push_back(TextureInfo(fileName,textureid,mipmap,hasalpha));
     textures.back().load();
 }
 
-void Game::LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize){
+void Game::LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize) {
     textures.push_back(TextureInfo(fileName,textureid,mipmap,array,skinsize));
     textures.back().load();
 }
@@ -776,9 +776,9 @@ void Game::InitGame()
 
 	LOG("Initializing sound system...");
 
-    int output = -1;
-
     #if PLATFORM_LINUX
+    int output = -1;
+    
     extern bool cmdline(const char *cmd);
     unsigned char rc = 0;
     output = OPENAL_OUTPUT_ALSA;  // Try alsa first...
@@ -850,7 +850,7 @@ void Game::InitGame()
 }
 
 
-void Game::LoadScreenTexture(){
+void Game::LoadScreenTexture() {
     glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
 
     if(!screentexture)
@@ -943,42 +943,42 @@ void Game::LoadStuff()
 
 	LOG("Loading weapon data...");
 
-	LoadTexture(":Data:Textures:knife.png",&weapons.knifetextureptr,0,1);
-	LoadTexture(":Data:Textures:bloodknife.png",&weapons.bloodknifetextureptr,0,1);
-	LoadTexture(":Data:Textures:lightbloodknife.png",&weapons.lightbloodknifetextureptr,0,1);
-	LoadTexture(":Data:Textures:sword.jpg",&weapons.swordtextureptr,1,0);
-	LoadTexture(":Data:Textures:Swordblood.jpg",&weapons.bloodswordtextureptr,1,0);
-	LoadTexture(":Data:Textures:Swordbloodlight.jpg",&weapons.lightbloodswordtextureptr,1,0);
-	LoadTexture(":Data:Textures:Staff.jpg",&weapons.stafftextureptr,1,0);
-
-	weapons.throwingknifemodel.load((char *)":Data:Models:throwingknife.solid",1);
-	weapons.throwingknifemodel.Scale(.001,.001,.001);
-	//weapons.throwingknifemodel.Rotate(0,0,-90);
-	weapons.throwingknifemodel.Rotate(90,0,0);
-	weapons.throwingknifemodel.Rotate(0,90,0);
-	weapons.throwingknifemodel.flat=0;
-	weapons.throwingknifemodel.CalculateNormals(1);
-	//weapons.throwingknifemodel.ScaleNormals(-1,-1,-1);
-
-	weapons.swordmodel.load((char *)":Data:Models:sword.solid",1);
-	weapons.swordmodel.Scale(.001,.001,.001);
-	//weapons.swordmodel.Rotate(0,0,-90);
-	weapons.swordmodel.Rotate(90,0,0);
-	weapons.swordmodel.Rotate(0,90,0);
-	weapons.swordmodel.Rotate(0,0,90);
-	weapons.swordmodel.flat=1;
-	weapons.swordmodel.CalculateNormals(1);
-	//weapons.swordmodel.ScaleNormals(-1,-1,-1);
-
-	weapons.staffmodel.load((char *)":Data:Models:staff.solid",1);
-	weapons.staffmodel.Scale(.005,.005,.005);
-	//weapons.staffmodel.Rotate(0,0,-90);
-	weapons.staffmodel.Rotate(90,0,0);
-	weapons.staffmodel.Rotate(0,90,0);
-	weapons.staffmodel.Rotate(0,0,90);
-	weapons.staffmodel.flat=1;
-	weapons.staffmodel.CalculateNormals(1);
-	//weapons.staffmodel.ScaleNormals(-1,-1,-1);
+	LoadTexture(":Data:Textures:knife.png",&Weapon::knifetextureptr,0,1);
+	LoadTexture(":Data:Textures:bloodknife.png",&Weapon::bloodknifetextureptr,0,1);
+	LoadTexture(":Data:Textures:lightbloodknife.png",&Weapon::lightbloodknifetextureptr,0,1);
+	LoadTexture(":Data:Textures:sword.jpg",&Weapon::swordtextureptr,1,0);
+	LoadTexture(":Data:Textures:Swordblood.jpg",&Weapon::bloodswordtextureptr,1,0);
+	LoadTexture(":Data:Textures:Swordbloodlight.jpg",&Weapon::lightbloodswordtextureptr,1,0);
+	LoadTexture(":Data:Textures:Staff.jpg",&Weapon::stafftextureptr,1,0);
+
+	Weapon::throwingknifemodel.load((char *)":Data:Models:throwingknife.solid",1);
+	Weapon::throwingknifemodel.Scale(.001,.001,.001);
+	//Weapon::throwingknifemodel.Rotate(0,0,-90);
+	Weapon::throwingknifemodel.Rotate(90,0,0);
+	Weapon::throwingknifemodel.Rotate(0,90,0);
+	Weapon::throwingknifemodel.flat=0;
+	Weapon::throwingknifemodel.CalculateNormals(1);
+	//Weapon::throwingknifemodel.ScaleNormals(-1,-1,-1);
+
+	Weapon::swordmodel.load((char *)":Data:Models:sword.solid",1);
+	Weapon::swordmodel.Scale(.001,.001,.001);
+	//Weapon::swordmodel.Rotate(0,0,-90);
+	Weapon::swordmodel.Rotate(90,0,0);
+	Weapon::swordmodel.Rotate(0,90,0);
+	Weapon::swordmodel.Rotate(0,0,90);
+	Weapon::swordmodel.flat=1;
+	Weapon::swordmodel.CalculateNormals(1);
+	//Weapon::swordmodel.ScaleNormals(-1,-1,-1);
+
+	Weapon::staffmodel.load((char *)":Data:Models:staff.solid",1);
+	Weapon::staffmodel.Scale(.005,.005,.005);
+	//Weapon::staffmodel.Rotate(0,0,-90);
+	Weapon::staffmodel.Rotate(90,0,0);
+	Weapon::staffmodel.Rotate(0,90,0);
+	Weapon::staffmodel.Rotate(0,0,90);
+	Weapon::staffmodel.flat=1;
+	Weapon::staffmodel.CalculateNormals(1);
+	//Weapon::staffmodel.ScaleNormals(-1,-1,-1);
 
 	//temptexdetail=texdetail;
 	//if(texdetail>4)texdetail=4;