X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=79a6a8de030f85980efbef4bff5d2f3aadcb8ab6;hb=dcfcaa86f46665886448d5aa6766b39c9e1c01b8;hp=e9655e9e61da66126e9c2a4b41bdfcb61d4cd070;hpb=5509b55dbc13227bdc7b97f2934fa71dad02cc66;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index e9655e9..79a6a8d 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -34,7 +34,6 @@ extern Light light;
 extern Skeleton testskeleton;
 extern int numsounds;
 extern Terrain terrain;
-//extern Sprites sprites;
 extern int kTextureSize;
 extern float texdetail;
 extern float realtexdetail;
@@ -53,7 +52,6 @@ extern float multiplier;
 extern int netdatanew;
 extern float mapinfo;
 extern bool stillloading;
-extern ImageRec texture;
 extern short vRefNum;
 extern long dirID;
 extern int mainmenu;
@@ -121,10 +119,6 @@ void Dispose()
     }
 
     OPENAL_Close();
-    if (texture.data) {
-        free(texture.data);
-    }
-    texture.data = 0;
 #endif
 }
 
@@ -171,7 +165,8 @@ void LoadSave(const char *fileName, GLuint *textureid, bool mipmap, GLubyte *arr
     texdetail = 1;
 
     //Load Image
-    upload_image(ConvertFileName(fileName));
+    ImageRec texture;
+    load_image(ConvertFileName(fileName), texture);
     texdetail = temptexdetail;
 
     int bytesPerPixel = texture.bpp / 8;
@@ -570,8 +565,6 @@ void Game::InitGame()
 
     stillloading = 1;
 
-    texture.data = ( GLubyte* )malloc( 1024 * 1024 * 4 );
-
     int temptexdetail = texdetail;
     texdetail = 1;
     text->LoadFontTexture(":Data:Textures:Font.png");
@@ -740,32 +733,26 @@ void Game::LoadStuff()
 
     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);
 
     terrain.shadowtexture.load(":Data:Textures:shadow.png", 0, 1);
     terrain.bloodtexture.load(":Data:Textures:blood.png", 0, 1);