quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix MD3 model entities crash on OS X (by renaming a class; apparently something weird happens when a class name is used twice)

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@201 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent
2009-03-04 07:06:05 +00:00
parent 8b446e3fbe
commit 469e4fc146
5 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/entity/model.h
View File

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "os/path.h"
#include "moduleobserver.h"
class Model : public ModuleObserver
class EModel : public ModuleObserver
{
ResourceReference m_resource;
scene::Traversable& m_traverse;
@@ -37,12 +37,12 @@ class Model : public ModuleObserver
Callback m_modelChanged;
public:
Model(scene::Traversable& traversable, const Callback& modelChanged)
EModel(scene::Traversable& traversable, const Callback& modelChanged)
: m_resource(""), m_traverse(traversable), m_node(0), m_modelChanged(modelChanged)
{
m_resource.attach(*this);
}
~Model()
~EModel()
{
m_resource.detach(*this);
}
@@ -73,7 +73,7 @@ public:
m_resource.attach(*this);
m_modelChanged();
}
typedef MemberCaller1<Model, const char*, &Model::modelChanged> ModelChangedCaller;
typedef MemberCaller1<EModel, const char*, &EModel::modelChanged> ModelChangedCaller;
const char* getName() const
{
@@ -88,7 +88,7 @@ public:
class SingletonModel
{
TraversableNode m_traverse;
Model m_model;
EModel m_model;
public:
SingletonModel()
: m_model(m_traverse, Callback())