diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp index 610c22bf7..3616283d9 100644 --- a/apps/openmw/mwgui/levelupdialog.cpp +++ b/apps/openmw/mwgui/levelupdialog.cpp @@ -43,7 +43,6 @@ namespace MWGui getWidget(t, "AttribMultiplier" + boost::lexical_cast(i)); - t->setCaption("x2"); mAttributeMultipliers.push_back(t); } diff --git a/apps/openmw/mwgui/stats_window.cpp b/apps/openmw/mwgui/stats_window.cpp index 88bc3dc90..701c39b0d 100644 --- a/apps/openmw/mwgui/stats_window.cpp +++ b/apps/openmw/mwgui/stats_window.cpp @@ -95,7 +95,6 @@ void StatsWindow::setBar(const std::string& name, const std::string& tname, int getWidget(pt, name); pt->setProgressRange(max); pt->setProgressPosition(val); - std::cout << "set bar " << name << val << " " << max << std::endl; std::stringstream out; out << val << "/" << max; diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 465f2c239..8f7c0d17a 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -404,7 +404,6 @@ void WindowManager::setValue (int parSkill, const MWMechanics::Stat& valu void WindowManager::setValue (const std::string& id, const MWMechanics::DynamicStat& value) { - std::cout << " set value " << id << value.getModified () << std::endl; mStatsWindow->setValue (id, value); mHud->setValue (id, value); mCharGen->setValue(id, value); diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp index fc99c44a8..2980aed59 100644 --- a/apps/openmw/mwmechanics/npcstats.cpp +++ b/apps/openmw/mwmechanics/npcstats.cpp @@ -128,10 +128,7 @@ float MWMechanics::NpcStats::getSkillGain (int skillIndex, const ESM::Class& cla throw std::runtime_error ("invalid skill specialisation factor"); } - //return 1.0 / (level +1) * (1.0 / (skillFactor)) * typeFactor * specialisationFactor; - - ///FIXME: TEST FOR FASTER LEVELLING - return 1.0 / (level +1) * (1.0 / (skillFactor/100)) * typeFactor * specialisationFactor; + return 1.0 / (level +1) * (1.0 / (skillFactor)) * typeFactor * specialisationFactor; } void MWMechanics::NpcStats::useSkill (int skillIndex, const ESM::Class& class_, int usageType) @@ -148,8 +145,7 @@ void MWMechanics::NpcStats::useSkill (int skillIndex, const ESM::Class& class_, base = level+1; // if this is a major or minor skill of the class, increase level progress - //bool levelProgress = false; - bool levelProgress = true; + bool levelProgress = false; for (int i=0; i<2; ++i) for (int j=0; j<5; ++j) { @@ -158,9 +154,6 @@ void MWMechanics::NpcStats::useSkill (int skillIndex, const ESM::Class& class_, levelProgress = true; } - if (!levelProgress) - std::cout <<"This is not a level skilL" << std::endl; - mLevelProgress += levelProgress; // check the attribute this skill belongs to