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

some cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-19 19:21:08 +01:00
parent dd70831a8c
commit f2a47d421b
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwdialogue/dialoguemanager.cpp
View file

@ -390,7 +390,6 @@ namespace MWDialogue
{ {
ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* npc = actor.get<ESM::NPC>(); ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* npc = actor.get<ESM::NPC>();
int isRace = int(toLower(npc->base->race) == toLower(name)); int isRace = int(toLower(npc->base->race) == toLower(name));
//std::cout << "isRace"<<isRace; mEnvironment.mWorld
if(selectCompare<int,int>(comp,!isRace,select.i)) if(selectCompare<int,int>(comp,!isRace,select.i))
return false; return false;
} }
@ -523,14 +522,6 @@ namespace MWDialogue
if (!isMatching (actor, *iter)) if (!isMatching (actor, *iter))
return false; return false;
/*std::cout
<< "unchecked entries:" << std::endl
<< " player faction: " << info.pcFaction << std::endl
<< " disposition: " << info.data.disposition << std::endl
<< " NPC rank: " << static_cast<int> (info.data.rank) << std::endl
<< " gender: " << static_cast<int> (info.data.gender) << std::endl
<< " PC rank: " << static_cast<int> (info.data.PCrank) << std::endl;*/
return true; return true;
} }
@ -553,7 +544,6 @@ namespace MWDialogue
std::list<std::string>::iterator it; std::list<std::string>::iterator it;
for(it = actorKnownTopics.begin();it != actorKnownTopics.end();it++) for(it = actorKnownTopics.begin();it != actorKnownTopics.end();it++)
{ {
MWGui::DialogueWindow* win = mEnvironment.mWindowManager->getDialogueWindow();
size_t pos = find_str_ci(text,*it,0); size_t pos = find_str_ci(text,*it,0);
if(pos !=std::string::npos) if(pos !=std::string::npos)
{ {
@ -574,7 +564,6 @@ namespace MWDialogue
{ {
mChoice = -1; mChoice = -1;
mIsInChoice = false; mIsInChoice = false;
std::cout << "talking with " << MWWorld::Class::get (actor).getName (actor) << std::endl;
mActor = actor; mActor = actor;

3
apps/openmw/mwgui/dialogue.cpp
View file

@ -64,7 +64,6 @@ DialogueWindow::DialogueWindow(WindowManager& parWindowManager,MWWorld::Environm
getWidget(pDispositionBar, "Disposition"); getWidget(pDispositionBar, "Disposition");
getWidget(pDispositionText,"DispositionText"); getWidget(pDispositionText,"DispositionText");
std::cout << "creation dialogue";
} }
void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender) void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
@ -126,7 +125,6 @@ void DialogueWindow::removeKeyword(std::string keyWord)
{ {
if(topicsList->findItemIndexWith(keyWord) != MyGUI::ITEM_NONE) if(topicsList->findItemIndexWith(keyWord) != MyGUI::ITEM_NONE)
{ {
std::cout << topicsList->findItemIndexWith(keyWord);
topicsList->removeItemAt(topicsList->findItemIndexWith(keyWord)); topicsList->removeItemAt(topicsList->findItemIndexWith(keyWord));
pTopicsText.erase(keyWord); pTopicsText.erase(keyWord);
} }
@ -200,4 +198,3 @@ void DialogueWindow::updateOptions()
pDispositionText->eraseText(0,pDispositionText->getTextLength()); pDispositionText->eraseText(0,pDispositionText->getTextLength());
pDispositionText->addText("#B29154"+std::string("40/100")+"#B29154"); pDispositionText->addText("#B29154"+std::string("40/100")+"#B29154");
} }