mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:23:51 +00:00
Code Issues Releases Wiki Activity

Clean up compilation warnings.

Browse source 
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2012-02-12 15:45:08 +01:00
parent bc71fb47e0
commit 8829d46bda
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/esmtool/esmtool_cmd.c
View file

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

4
apps/openmw/mwgui/journalwindow.cpp
View file

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

2
apps/openmw/mwrender/animation.cpp
View file

@ -499,7 +499,7 @@ namespace MWRender{
std::vector<Ogre::Quaternion> quats = iter->getQuat(); std::vector<Ogre::Quaternion> quats = iter->getQuat();
std::vector<float> ttime = iter->gettTime(); 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(); std::vector<float> rtime = iter->getrTime();
int rindexJ = 0; int rindexJ = 0;

2
apps/openmw/mwrender/npcanimation.cpp
View file

@ -267,7 +267,7 @@ void NpcAnimation::runAnimation(float timepassed){
} }
handleAnimationTransforms(); 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<std::vector<Nif::NiTriShapeCopy>*>::iterator shapepartsiter = shapeparts.begin();
std::vector<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin(); std::vector<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin();

4
components/nif/data.hpp
View file

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

4
components/nifogre/ogre_nif_loader.cpp
View file

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