mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-11-03 23:56:43 +00:00 
			
		
		
		
	removed some debug stuff
This commit is contained in:
		
							parent
							
								
									76b494100e
								
							
						
					
					
						commit
						b34b894d6a
					
				
					 4 changed files with 2 additions and 12 deletions
				
			
		| 
						 | 
					@ -43,7 +43,6 @@ namespace MWGui
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            getWidget(t, "AttribMultiplier" + boost::lexical_cast<std::string>(i));
 | 
					            getWidget(t, "AttribMultiplier" + boost::lexical_cast<std::string>(i));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            t->setCaption("x2");
 | 
					 | 
				
			||||||
            mAttributeMultipliers.push_back(t);
 | 
					            mAttributeMultipliers.push_back(t);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -95,7 +95,6 @@ void StatsWindow::setBar(const std::string& name, const std::string& tname, int
 | 
				
			||||||
    getWidget(pt, name);
 | 
					    getWidget(pt, name);
 | 
				
			||||||
    pt->setProgressRange(max);
 | 
					    pt->setProgressRange(max);
 | 
				
			||||||
    pt->setProgressPosition(val);
 | 
					    pt->setProgressPosition(val);
 | 
				
			||||||
    std::cout << "set bar " << name << val << " " << max << std::endl;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    std::stringstream out;
 | 
					    std::stringstream out;
 | 
				
			||||||
    out << val << "/" << max;
 | 
					    out << val << "/" << max;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -404,7 +404,6 @@ void WindowManager::setValue (int parSkill, const MWMechanics::Stat<float>& valu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void WindowManager::setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value)
 | 
					void WindowManager::setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    std::cout << " set value " << id << value.getModified () << std::endl;
 | 
					 | 
				
			||||||
    mStatsWindow->setValue (id, value);
 | 
					    mStatsWindow->setValue (id, value);
 | 
				
			||||||
    mHud->setValue (id, value);
 | 
					    mHud->setValue (id, value);
 | 
				
			||||||
    mCharGen->setValue(id, value);
 | 
					    mCharGen->setValue(id, value);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -128,10 +128,7 @@ float MWMechanics::NpcStats::getSkillGain (int skillIndex, const ESM::Class& cla
 | 
				
			||||||
            throw std::runtime_error ("invalid skill specialisation factor");
 | 
					            throw std::runtime_error ("invalid skill specialisation factor");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //return 1.0 / (level +1) * (1.0 / (skillFactor)) * typeFactor * specialisationFactor;
 | 
					    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;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void MWMechanics::NpcStats::useSkill (int skillIndex, const ESM::Class& class_, int usageType)
 | 
					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;
 | 
					        base = level+1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // if this is a major or minor skill of the class, increase level progress
 | 
					        // if this is a major or minor skill of the class, increase level progress
 | 
				
			||||||
        //bool levelProgress = false;
 | 
					        bool levelProgress = false;
 | 
				
			||||||
        bool levelProgress = true;
 | 
					 | 
				
			||||||
        for (int i=0; i<2; ++i)
 | 
					        for (int i=0; i<2; ++i)
 | 
				
			||||||
            for (int j=0; j<5; ++j)
 | 
					            for (int j=0; j<5; ++j)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					@ -158,9 +154,6 @@ void MWMechanics::NpcStats::useSkill (int skillIndex, const ESM::Class& class_,
 | 
				
			||||||
                    levelProgress = true;
 | 
					                    levelProgress = true;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (!levelProgress)
 | 
					 | 
				
			||||||
            std::cout <<"This is not a level skilL" << std::endl;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        mLevelProgress += levelProgress;
 | 
					        mLevelProgress += levelProgress;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // check the attribute this skill belongs to
 | 
					        // check the attribute this skill belongs to
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue