Fixed lots of errors spotted by cppcheck

[lugaru.git] / Source / GameInitDispose.cpp

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index b7d90926a1ba641655e92ada8ea52dc307896bc0..c19db0293240a3ce7532126b02b6b4d51848bdac 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -3,20 +3,18 @@ Copyright (C) 2003, 2010 - Wolfire Games
 
 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 <http://www.gnu.org/licenses/>.
 */
 
 #include "Game.h"
@@ -164,9 +162,6 @@ void Game::deleteGame()
 
 void LoadSave(const char *fileName, GLuint *textureid, bool mipmap, GLubyte *array, int *skinsize)
 {
-    int i;
-    int bytesPerPixel;
-
     LOGFUNC;
 
     LOG(std::string("Loading (S)...") + fileName);
@@ -174,8 +169,6 @@ void LoadSave(const char *fileName, GLuint *textureid, bool mipmap, GLubyte *arr
     //Load Image
     float temptexdetail = texdetail;
     texdetail = 1;
-    //upload_image( fileName );
-    //LoadTGA( fileName );
 
     // Converting file to something os specific
     char * fixedFN = ConvertFileName(fileName);
@@ -187,16 +180,13 @@ void LoadSave(const char *fileName, GLuint *textureid, bool mipmap, GLubyte *arr
     upload_image( fileNamep , 0);
     texdetail = temptexdetail;
 
-    //Is it valid?
-    if (1 == 1) {
-        bytesPerPixel = texture.bpp / 8;
+    int bytesPerPixel = texture.bpp / 8;
 
-        int tempnum = 0;
-        for (i = 0; i < (int)(texture.sizeY * texture.sizeX * bytesPerPixel); i++) {
-            if ((i + 1) % 4 || bytesPerPixel == 3) {
-                array[tempnum] = texture.data[i];
-                tempnum++;
-            }
+    int tempnum = 0;
+    for (int i = 0; i < (int)(texture.sizeY * texture.sizeX * bytesPerPixel); i++) {
+        if ((i + 1) % 4 || bytesPerPixel == 3) {
+            array[tempnum] = texture.data[i];
+            tempnum++;
         }
     }
 }
@@ -642,10 +632,8 @@ void Game::InitGame()
     LOG("Initializing sound system...");
 
 #if PLATFORM_LINUX
-    int output = -1;
-
     unsigned char rc = 0;
-    output = OPENAL_OUTPUT_ALSA;  // Try alsa first...
+    int output = OPENAL_OUTPUT_ALSA;  // Try alsa first...
     if (cmdline("forceoss"))      //  ...but let user override that.
         output = OPENAL_OUTPUT_OSS;
     else if (cmdline("nosound"))
@@ -779,9 +767,6 @@ void Game::LoadStuff()
 
     realtexdetail = texdetail;
 
-    numplayers = 1;
-
-
     LOG("Loading weapon data...");
 
     Weapon::knifetextureptr.load(":Data:Textures:knife.png", 0, 1);