[[ Bug 15565 ]] Fixed create ctrl in card "..."

abrisan · abrisan · commit e59b702dc127 · 2017-05-17T16:14:32.000+01:00
diff --git a/docs/notes/feature-create-in.md b/docs/notes/feature-create-in.md
@@ -0,0 +1,3 @@
+# Additional forms of create command
+- Create <card> in <stack> now works correctly
+- You can now create <control> in <card> as well as in <group>
diff --git a/engine/src/card.h b/engine/src/card.h
@@ -136,7 +136,7 @@ class MCCard : public MCObject, public MCMixinObjectHandle<MCCard>
 	IO_stat loadobjects(IO_handle stream, uint32_t version);
 
 	void kfocusset(MCControl *target);
-	MCCard *clone(Boolean attach, Boolean controls, MCStack *p_parent=nullptr);
+	MCCard *clone(Boolean attach, Boolean controls, MCStack *p_parent = nullptr);
 	void clonedata(MCCard *source);
 	void replacedata(MCStack *source);
 	Exec_stat relayer(MCControl *optr, uint2 newlayer);
diff --git a/engine/src/cmdsc.cpp b/engine/src/cmdsc.cpp
@@ -660,7 +660,7 @@ void MCCreate::exec_ctxt(MCExecContext& ctxt)
                     uint4 parid;
 
                     if (!container->getobj(ctxt, parent, parid, True)
-                            || parent->gettype() != CT_GROUP)
+                            || (parent->gettype() != CT_GROUP && parent->gettype() != CT_CARD) )
                     {
                         ctxt . LegacyThrow(EE_CREATE_BADBGORCARD);
                         return;
diff --git a/engine/src/exec-interface.cpp b/engine/src/exec-interface.cpp
@@ -3299,7 +3299,7 @@ void MCInterfaceExecCreateCard(MCExecContext& ctxt, MCStringRef p_new_name, MCSt
     ctxt . SetItToValue(*t_id);
 }
 
-MCControl* MCInterfaceExecCreateControlGetObject(MCExecContext& ctxt, int p_type, MCGroup *&r_parent)
+MCControl* MCInterfaceExecCreateControlGetObject(MCExecContext& ctxt, int p_type, MCObject *&r_parent)
 {
 	switch (p_type)
 	{
@@ -3328,9 +3328,9 @@ MCControl* MCInterfaceExecCreateControlGetObject(MCExecContext& ctxt, int p_type
 	}
 }
 
-void MCInterfaceExecCreateControl(MCExecContext& ctxt, MCStringRef p_new_name, int p_type, MCGroup *p_container, bool p_force_invisible)
+void MCInterfaceExecCreateControl(MCExecContext& ctxt, MCStringRef p_new_name, int p_type, MCObject *p_container, bool p_force_invisible)
 {
-	if (MCdefaultstackptr->islocked())
+    if (MCdefaultstackptr->islocked())
 	{
 		ctxt . LegacyThrow(EE_CREATE_LOCKED);
 		return;
diff --git a/engine/src/exec.h b/engine/src/exec.h
@@ -3120,7 +3120,7 @@ void MCInterfaceExecCreateStack(MCExecContext& ctxt, MCStack *p_owner, MCStringR
 void MCInterfaceExecCreateScriptOnlyStack(MCExecContext& ctxt, MCStringRef p_new_name);
 void MCInterfaceExecCreateStackWithGroup(MCExecContext& ctxt, MCGroup *p_group_to_copy, MCStringRef p_new_name, bool p_force_invisible);
 void MCInterfaceExecCreateCard(MCExecContext& ctxt, MCStringRef p_new_name, MCStack *p_parent, bool p_force_invisible);
-void MCInterfaceExecCreateControl(MCExecContext& ctxt, MCStringRef p_new_name, int p_type, MCGroup *p_container, bool p_force_invisible);
+void MCInterfaceExecCreateControl(MCExecContext& ctxt, MCStringRef p_new_name, int p_type, MCObject *p_container, bool p_force_invisible);
 void MCInterfaceExecCreateWidget(MCExecContext& ctxt, MCStringRef p_new_name, MCNameRef p_kind, MCGroup *p_container, bool p_force_invisible);
 
 void MCInterfaceExecClone(MCExecContext& ctxt, MCObject *p_target, MCStringRef p_new_name, bool p_force_invisible);
diff --git a/tests/lcs/core/interface/stack.livecodescript b/tests/lcs/core/interface/stack.livecodescript
@@ -32,6 +32,7 @@ on TestCreateControlInCard
 	create stack "Temp"
 
 	create card "Other"
+	create card "Other2"
 
 	create button "Test" in card "Other"
 
@@ -40,10 +41,10 @@ end TestCreateControlInCard
 
 on TestCreateControlInStack	
 	create stack "Temp"
+	create stack "Temp2"
 
 	create card "Other" in stack "Temp"
 
-	put there is a card "Other"
 
 	TestAssert "test if the card was created in the correct stack" , there is a card "Other" of stack "Temp"
 end TestCreateControlInStack

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Additional forms of create command`
	`2`	`+- Create <card> in <stack> now works correctly`
	`3`	`+- You can now create <control> in <card> as well as in <group>`
Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ void MCCreate::exec_ctxt(MCExecContext& ctxt)`
`660`	`660`	`uint4 parid;`
`661`	`661`
`662`	`662`	`if (!container->getobj(ctxt, parent, parid, True)`
`663`		`- \|\| parent->gettype() != CT_GROUP)`
	`663`	`+ \|\| (parent->gettype() != CT_GROUP && parent->gettype() != CT_CARD) )`
`664`	`664`	`{`
`665`	`665`	`ctxt . LegacyThrow(EE_CREATE_BADBGORCARD);`
`666`	`666`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -3299,7 +3299,7 @@ void MCInterfaceExecCreateCard(MCExecContext& ctxt, MCStringRef p_new_name, MCSt`
`3299`	`3299`	`ctxt . SetItToValue(*t_id);`
`3300`	`3300`	`}`
`3301`	`3301`
`3302`		`-MCControl* MCInterfaceExecCreateControlGetObject(MCExecContext& ctxt, int p_type, MCGroup *&r_parent)`
	`3302`	`+MCControl* MCInterfaceExecCreateControlGetObject(MCExecContext& ctxt, int p_type, MCObject *&r_parent)`
`3303`	`3303`	`{`
`3304`	`3304`	`switch (p_type)`
`3305`	`3305`	`{`
`@@ -3328,9 +3328,9 @@ MCControl* MCInterfaceExecCreateControlGetObject(MCExecContext& ctxt, int p_type`
`3328`	`3328`	`}`
`3329`	`3329`	`}`
`3330`	`3330`
`3331`		`-void MCInterfaceExecCreateControl(MCExecContext& ctxt, MCStringRef p_new_name, int p_type, MCGroup *p_container, bool p_force_invisible)`
	`3331`	`+void MCInterfaceExecCreateControl(MCExecContext& ctxt, MCStringRef p_new_name, int p_type, MCObject *p_container, bool p_force_invisible)`
`3332`	`3332`	`{`
`3333`		`- if (MCdefaultstackptr->islocked())`
	`3333`	`+ if (MCdefaultstackptr->islocked())`
`3334`	`3334`	`{`
`3335`	`3335`	`ctxt . LegacyThrow(EE_CREATE_LOCKED);`
`3336`	`3336`	`return;`