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