mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-29 03:26:38 +00:00
Code Issues Releases Wiki Activity

add physic and solve a problem with window.h macro min/max

Browse source
This commit is contained in:
gugus 2011-02-19 19:18:03 +01:00
parent ff941b5963
commit 84dce2eb36
5 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,9 @@
#include <iterator>
#include <boost/lexical_cast.hpp>
#undef min
#undef max
using namespace MWGui;
const int StatsWindow::lineHeight = 18;

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

@ -6,6 +6,9 @@
#include <boost/lexical_cast.hpp>
#undef min
#undef max
using namespace MWGui;
using namespace MWGui::Widgets;

3
apps/openmw/mwmechanics/stat.hpp
View file

@ -1,6 +1,9 @@
#ifndef GAME_MWMECHANICS_STAT_H
#define GAME_MWMECHANICS_STAT_H
#undef min
#undef max
#include <limits>
namespace MWMechanics

3
apps/openmw/mwrender/mwscene.cpp
View file

@ -19,9 +19,10 @@
using namespace MWRender;
using namespace Ogre;
MWScene::MWScene(OEngine::Render::OgreRenderer &_rend)
MWScene::MWScene(OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng)
: rend(_rend)
{
eng = physEng;
rend.createScene("PlayerCam", 55, 5);
// Set default mipmap level (NB some APIs ignore this)

2
apps/openmw/mwrender/mwscene.hpp
View file

@ -46,7 +46,7 @@ namespace MWRender
public:
MWScene (OEngine::Render::OgreRenderer &_rend);
MWScene (OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng);
~MWScene();