Merge remote branch 'lgro/fix_warnings'

apps/esmtool/esmtool_cmd.c

@@ -926,13 +926,13 @@ int update_arg(void *field, char **orig_field,
                const char *long_opt, char short_opt,
                const char *additional_error)
 {
-  char *stop_char = 0;
-  const char *val = value;
-  int found;
+  //char *stop_char = 0;
+  //const char *val = value;
+  //int found;
   FIX_UNUSED (field);
 
-  stop_char = 0;
-  found = 0;
+  //stop_char = 0;
+  //found = 0;
 
   if (!multiple_option && prev_given && (*prev_given || (check_ambiguity && *field_given)))
     {
@@ -955,8 +955,8 @@ int update_arg(void *field, char **orig_field,
     (*prev_given)++;
   if (field_given)
     (*field_given)++;
-  if (possible_values)
-    val = possible_values[found];
+  //if (possible_values)
+    //val = possible_values[found];
 
   switch(arg_type) {
   default:
@@ -996,7 +996,7 @@ cmdline_parser_internal (
   
   int override;
   int initialize;
-  int check_required;
+  //int check_required;
   int check_ambiguity;
 
   char *optarg;
@@ -1008,7 +1008,7 @@ cmdline_parser_internal (
   
   override = params->override;
   initialize = params->initialize;
-  check_required = params->check_required;
+  //check_required = params->check_required;
   check_ambiguity = params->check_ambiguity;
 
   if (initialize)

apps/openmw/mwgui/journalwindow.cpp

@@ -32,8 +32,8 @@ book formatText(std::string text,book mBook,int maxLine, int lineSize)
         mBook.pages.pop_back();
     }
 
-    std::string::iterator wordBegin = text.begin();
-    std::string::iterator wordEnd;
+    //std::string::iterator wordBegin = text.begin();
+    //std::string::iterator wordEnd;
 
     std::string cText = text;
 

apps/openmw/mwrender/animation.cpp

@@ -499,7 +499,7 @@ namespace MWRender{
 	    std::vector<Ogre::Quaternion> quats = iter->getQuat();
 
         std::vector<float> ttime = iter->gettTime();
-        std::vector<float>::iterator ttimeiter = ttime.begin();
+        //std::vector<float>::iterator ttimeiter = ttime.begin();
 
         std::vector<float> rtime = iter->getrTime();
         int rindexJ = 0;

apps/openmw/mwrender/npcanimation.cpp

@@ -267,7 +267,7 @@ void NpcAnimation::runAnimation(float timepassed){
         }
 
         handleAnimationTransforms();
-        Ogre::Vector3 current = insert->_getWorldAABB().getCenter();
+        //Ogre::Vector3 current = insert->_getWorldAABB().getCenter();
 
         std::vector<std::vector<Nif::NiTriShapeCopy>*>::iterator shapepartsiter = shapeparts.begin();
         std::vector<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin();

components/nif/data.hpp

@@ -473,7 +473,7 @@ void read(NIFFile *nif)
     int vertCount  = nif->getInt();
     nif->getByte();
 	int magic = nif->getInt();
-	int type = nif->getInt();
+	/*int type =*/ nif->getInt();
 	for(int i = 0; i < vertCount; i++){
 
 		float x = nif->getFloat();
@@ -485,7 +485,7 @@ void read(NIFFile *nif)
     for(int i=1; i<morphCount; i++)
     {
         magic = nif->getInt();
-        type = nif->getInt();
+        /*type =*/ nif->getInt();
 		std::vector<Ogre::Vector3> current;
 		std::vector<float> currentTime;
         for(int i = 0; i < magic; i++){

components/nifogre/ogre_nif_loader.cpp

@@ -1150,7 +1150,7 @@ void NIFLoader::loadResource(Resource *resource)
     char suffix = name.at(name.length() - 2);
     bool addAnim = true;
     bool hasAnim = false;
-    bool baddin = false;
+    //bool baddin = false;
     bNiTri = true;
 
         if(suffix == '*')
@@ -1168,7 +1168,7 @@ void NIFLoader::loadResource(Resource *resource)
 		}
 		else if(suffix == '>')
 		{
-            baddin = true;
+            //baddin = true;
 			bNiTri = true;
 			std::string sub = name.substr(name.length() - 6, 4);