krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fixes on Namespace issue & more.

Browse source
This commit is contained in:
pchan3 2012-04-18 22:35:35 +10:00
parent 489261a6ae
commit f902c8fa6f
2 changed files with 60 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
apps/openmw/mwgui/container.cpp
View file

@ -28,7 +28,7 @@ ContainerWindow::ContainerWindow(WindowManager& parWindowManager,MWWorld::Enviro
mEnvironment(environment) mEnvironment(environment)
{ {
setText("_Main", "Name of Container"); setText("_Main", "Name of Container");
center(); //center();
adjustWindowCaption(); adjustWindowCaption();
getWidget(containerWidget, "Items"); getWidget(containerWidget, "Items");
@ -90,7 +90,54 @@ void ContainerWindow::open(MWWorld::Ptr& container)
containerStore.add(bukkitRef.getPtr()); containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr()); containerStore.add(bukkitRef.getPtr());
containerStore.add(goldRef.getPtr()); containerStore.add(goldRef.getPtr());
containerStore.add(furRef.getPtr());
containerStore.add(furRef.getPtr());
containerStore.add(furRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(goldRef.getPtr());
containerStore.add(furRef.getPtr());
containerStore.add(furRef.getPtr());
containerStore.add(furRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(broomRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(bukkitRef.getPtr());
containerStore.add(goldRef.getPtr());
// ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref = iter->get<ESM::Armor>(); // ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref = iter->get<ESM::Armor>();
@ -103,39 +150,35 @@ void ContainerWindow::open(MWWorld::Ptr& container)
for (MWWorld::ContainerStoreIterator iter (containerStore.begin()); iter!=containerStore.end(); ++iter) for (MWWorld::ContainerStoreIterator iter (containerStore.begin()); iter!=containerStore.end(); ++iter)
{ {
std::string path = std::string("icons\\"); std::string path = std::string("icons\\");
path+=MWWorld::Class::get(*iter).getInventoryIcon(*iter); path+=MWWorld::Class::get(*iter).getInventoryIcon(*iter);
count++; count++;
if(count % 8 == 0) MyGUI::ImageBox* image = containerWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(x, y, 32, 32), MyGUI::Align::Default);
MyGUI::TextBox* text = containerWidget->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(x, y, 18, 18), MyGUI::Align::Default, std::string("Label"));
x += 36;
if(count % 20 == 0)
{ {
y += 36; y += 36;
x = 4; x = 4;
count = 0; count = 0;
} }
x += 36;
MyGUI::ImageBox* image = containerWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(x, y, 32, 32), MyGUI::Align::Default);
MyGUI::TextBox* text = containerWidget->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(x, y, 18, 18), MyGUI::Align::Default, std::string("Label"));
if(iter->getRefData().getCount() > 1) if(iter->getRefData().getCount() > 1)
text->setCaption(boost::lexical_cast<std::string>(iter->getRefData().getCount())); text->setCaption(boost::lexical_cast<std::string>(iter->getRefData().getCount()));
containerWidgets.push_back(image); containerWidgets.push_back(image);
int pos = path.rfind("."); int pos = path.rfind(".");
path.erase(pos); path.erase(pos);
path.append(".dds"); path.append(".dds");
//std::cout << path << std::endl; //std::cout << path << std::endl;
image->setImageTexture(path); image->setImageTexture(path);
} }
setVisible(true); setVisible(true);
} }
@ -146,6 +189,8 @@ void ContainerWindow::Update()
void ContainerWindow::onByeClicked(MyGUI::Widget* _sender) void ContainerWindow::onByeClicked(MyGUI::Widget* _sender)
{ {
mEnvironment.mWindowManager->setGuiMode(MWGui::GuiMode::GM_Game); mEnvironment.mWindowManager->setGuiMode(GM_Game);
setVisible(false);
} }

2
apps/openmw/mwworld/actionopen.cpp
View file

@ -16,7 +16,7 @@ namespace MWWorld
void ActionOpen::execute (Environment& environment) void ActionOpen::execute (Environment& environment)
{ {
environment.mWindowManager->setGuiMode(MWGui::GuiMode::GM_Container); environment.mWindowManager->setGuiMode(MWGui::GM_Container);
environment.mWindowManager->getContainerWindow()->open(mContainer); environment.mWindowManager->getContainerWindow()->open(mContainer);
} }
} }