Instances call constructor of base class
This commit is contained in:
@@ -6,6 +6,7 @@ ButtonListener* listener = NULL;
|
||||
|
||||
BaseButtonInstance::BaseButtonInstance(void)
|
||||
{
|
||||
Instance::Instance();
|
||||
listener = NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
DataModelInstance::DataModelInstance(void)
|
||||
{
|
||||
Instance::Instance();
|
||||
workspace = new WorkspaceInstance();
|
||||
guiRoot = new Instance();
|
||||
children.push_back(workspace);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
ImageButtonInstance::ImageButtonInstance(G3D::TextureRef newImage, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
|
||||
{
|
||||
|
||||
BaseButtonInstance::BaseButtonInstance();
|
||||
image = newImage;
|
||||
openGLID = image->getOpenGLID();
|
||||
image_ovr = overImage;
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
PhysicalInstance::PhysicalInstance(void)
|
||||
{
|
||||
Instance::Instance();
|
||||
name = "Default PhysicalInstance";
|
||||
className = "Part";
|
||||
canCollide = true;
|
||||
@@ -23,6 +24,7 @@ PhysicalInstance::PhysicalInstance(void)
|
||||
|
||||
PhysicalInstance::PhysicalInstance(const PhysicalInstance &oinst)
|
||||
{
|
||||
Instance::Instance(oinst);
|
||||
name = oinst.name;
|
||||
className = "Part";
|
||||
canCollide = oinst.canCollide;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
TextButtonInstance::TextButtonInstance(void)
|
||||
{
|
||||
BaseButtonInstance::BaseButtonInstance();
|
||||
boxBegin = Vector2(0,0);
|
||||
boxEnd = Vector2(0,0);
|
||||
fontLocationRelativeTo = Vector2(0,0);
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
|
||||
WorkspaceInstance::WorkspaceInstance(void)
|
||||
{
|
||||
className = "Workspace";
|
||||
Instance::Instance();
|
||||
name = "Instance";
|
||||
className = "Level";
|
||||
timer = 60.0F;
|
||||
score = 0;
|
||||
}
|
||||
|
||||
@@ -9,4 +9,5 @@ public:
|
||||
int score;
|
||||
WorkspaceInstance(void);
|
||||
~WorkspaceInstance(void);
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user