1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00

fixing some unrelated warnings

This commit is contained in:
scrawl 2012-09-23 19:36:37 +02:00
parent bf3aad8be0
commit 1cb1259e18
8 changed files with 10 additions and 20 deletions

View file

@ -124,8 +124,6 @@ namespace MWClass
info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount()); info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
info.icon = ref->base->icon; info.icon = ref->base->icon;
const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
std::string text; std::string text;
text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight); text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);

View file

@ -129,8 +129,6 @@ namespace MWClass
info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount()); info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
info.icon = ref->base->icon; info.icon = ref->base->icon;
const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
std::string text; std::string text;
text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight); text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);

View file

@ -362,7 +362,7 @@ void ContainerBase::drawItems()
int maxHeight = mItemView->getSize().height - 58; int maxHeight = mItemView->getSize().height - 58;
bool onlyMagic = false; bool onlyMagic = false;
int categories; int categories = 0;
if (mFilter == Filter_All) if (mFilter == Filter_All)
categories = MWWorld::ContainerStore::Type_All; categories = MWWorld::ContainerStore::Type_All;
else if (mFilter == Filter_Weapon) else if (mFilter == Filter_Weapon)

View file

@ -475,8 +475,6 @@ void StatsWindow::updateSkillArea()
text += "\n#BF9959"; text += "\n#BF9959";
for (int i=0; i<6; ++i) for (int i=0; i<6; ++i)
{ {
const ESM::Skill* skill = MWBase::Environment::get().getWorld()->getStore().skills.search(faction->data.skillID[i]);
assert(skill);
text += "#{"+ESM::Skill::sSkillNameIds[faction->data.skillID[i]]+"}"; text += "#{"+ESM::Skill::sSkillNameIds[faction->data.skillID[i]]+"}";
if (i<5) if (i<5)
text += ", "; text += ", ";

View file

@ -368,7 +368,7 @@ IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
if (text.size() > 0 && text[0] == '\n') if (text.size() > 0 && text[0] == '\n')
text.erase(0, 1); text.erase(0, 1);
const ESM::Enchantment* enchant; const ESM::Enchantment* enchant = 0;
const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore(); const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
if (info.enchant != "") if (info.enchant != "")
{ {
@ -440,6 +440,7 @@ IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
if (info.enchant != "") if (info.enchant != "")
{ {
assert(enchant);
Widget* enchantArea = mDynamicToolTipBox->createWidget<Widget>("", Widget* enchantArea = mDynamicToolTipBox->createWidget<Widget>("",
IntCoord(0, totalSize.height, 300, 300-totalSize.height), IntCoord(0, totalSize.height, 300, 300-totalSize.height),
Align::Stretch, "ToolTipEnchantArea"); Align::Stretch, "ToolTipEnchantArea");

View file

@ -303,16 +303,11 @@ namespace Physic
+ boost::lexical_cast<std::string>(y); + boost::lexical_cast<std::string>(y);
// find the minimum and maximum heights (needed for bullet) // find the minimum and maximum heights (needed for bullet)
float minh; float minh = heights[0];
float maxh; float maxh = heights[0];
for (int i=0; i<sqrtVerts*sqrtVerts; ++i) for (int i=0; i<sqrtVerts*sqrtVerts; ++i)
{ {
float h = heights[i]; float h = heights[i];
if (i==0)
{
minh = h;
maxh = h;
}
if (h>maxh) maxh = h; if (h>maxh) maxh = h;
if (h<minh) minh = h; if (h<minh) minh = h;

View file

@ -171,11 +171,11 @@ bool PM_SlideMove( bool gravity )
Ogre::Vector3 clipVelocity; Ogre::Vector3 clipVelocity;
int i, j, k; int i, j, k;
struct traceResults trace; struct traceResults trace;
Ogre::Vector3 end; Ogre::Vector3 end(0,0,0);
float time_left; float time_left;
float into; float into;
Ogre::Vector3 endVelocity; Ogre::Vector3 endVelocity(0,0,0);
Ogre::Vector3 endClipVelocity; Ogre::Vector3 endClipVelocity(0,0,0);
numbumps = 4; numbumps = 4;

View file

@ -13,8 +13,8 @@
void newtrace(traceResults* const results, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBHalfExtents, const float rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass) //Traceobj was a Aedra Object void newtrace(traceResults* const results, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBHalfExtents, const float rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass) //Traceobj was a Aedra Object
{ {
static float lastyaw = 0.0f; //static float lastyaw = 0.0f;
static float lastpitch = 0.0f; //static float lastpitch = 0.0f;
//if (!traceobj) //if (!traceobj)
// return; // return;