[[Bugfix-14721]] Cleanup variables

andrewferguson · andrewferguson · commit 334024473176 · 2018-08-17T11:52:16.000+01:00
The visibiltyType variable has been renamed to visibility_type to
conform to the coding standards.

An unnecessary instance of the MCInterfaceExecGoVisibilityType enum
was removed and replaced with a direct reference to the enum.

The visibile boolean variable is now redundant and has been removed.
diff --git a/engine/src/cmds.h b/engine/src/cmds.h
@@ -1737,8 +1737,7 @@ class MCGo : public MCStatement
 	MCExpression *window;
 	Window_mode mode;
 	Boolean marked;
-	Boolean visible;
-	MCInterfaceExecGoVisibility visibilityType = kMCInterfaceExecGoVisibilityImplicit;
+	MCInterfaceExecGoVisibility visibility_type;
 	Boolean thisstack;
 	
 	MCChunk *widget;
@@ -1751,7 +1750,7 @@ class MCGo : public MCStatement
 		window(nil),
 		mode(WM_LAST),
         marked(False),
-        visible(True),
+        visibility_type(kMCInterfaceExecGoVisibilityImplicit),
         thisstack(False),
 		widget(nil),
         direction(CT_BACKWARD)
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -112,9 +112,9 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)
 
 	initpoint(sp);
 	if (sp.skip_token(SP_FACTOR, TT_PROPERTY, P_INVISIBLE) == PS_NORMAL)
-		visibilityType = kMCInterfaceExecGoVisibilityExplicitInvisible;
+		visibility_type = kMCInterfaceExecGoVisibilityExplicitInvisible;
 	if (sp.skip_token(SP_FACTOR, TT_PROPERTY, P_VISIBLE) == PS_NORMAL)
-		visibilityType = kMCInterfaceExecGoVisibilityExplicitVisible;
+		visibility_type = kMCInterfaceExecGoVisibilityExplicitVisible;
 	while (True)
 	{
 		if (sp.next(type) != PS_NORMAL)
@@ -746,9 +746,9 @@ void MCGo::exec_ctxt(MCExecContext &ctxt)
 		}
 	}
 	else if (window != nil)
-		MCInterfaceExecGoCardInWindow(ctxt, cptr, *t_window, visibilityType, thisstack == True);
+		MCInterfaceExecGoCardInWindow(ctxt, cptr, *t_window, visibility_type, thisstack == True);
 	else
-        MCInterfaceExecGoCardAsMode(ctxt, cptr, mode, visibilityType, thisstack == True);
+        MCInterfaceExecGoCardAsMode(ctxt, cptr, mode, visibility_type, thisstack == True);
 }
 
 MCHide::~MCHide()
diff --git a/engine/src/exec-interface.cpp b/engine/src/exec-interface.cpp
@@ -4576,8 +4576,7 @@ void MCInterfaceExecGoHome(MCExecContext& ctxt, MCCard *p_card)
 		MCdefaultstackptr->close();
 		MCdefaultstackptr->checkdestroy();
 	}
-	MCInterfaceExecGoVisibility visibilityType = kMCInterfaceExecGoVisibilityImplicit;
-	MCInterfaceExecGo(ctxt, p_card, nil, 0, false, visibilityType);
+	MCInterfaceExecGo(ctxt, p_card, nil, 0, false, MCInterfaceExecGoVisibility(kMCInterfaceExecGoVisibilityImplicit));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,9 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)`
`112`	`112`
`113`	`113`	`initpoint(sp);`
`114`	`114`	`if (sp.skip_token(SP_FACTOR, TT_PROPERTY, P_INVISIBLE) == PS_NORMAL)`
`115`		`- visibilityType = kMCInterfaceExecGoVisibilityExplicitInvisible;`
	`115`	`+ visibility_type = kMCInterfaceExecGoVisibilityExplicitInvisible;`
`116`	`116`	`if (sp.skip_token(SP_FACTOR, TT_PROPERTY, P_VISIBLE) == PS_NORMAL)`
`117`		`- visibilityType = kMCInterfaceExecGoVisibilityExplicitVisible;`
	`117`	`+ visibility_type = kMCInterfaceExecGoVisibilityExplicitVisible;`
`118`	`118`	`while (True)`
`119`	`119`	`{`
`120`	`120`	`if (sp.next(type) != PS_NORMAL)`
`@@ -746,9 +746,9 @@ void MCGo::exec_ctxt(MCExecContext &ctxt)`
`746`	`746`	`}`
`747`	`747`	`}`
`748`	`748`	`else if (window != nil)`
`749`		`- MCInterfaceExecGoCardInWindow(ctxt, cptr, *t_window, visibilityType, thisstack == True);`
	`749`	`+ MCInterfaceExecGoCardInWindow(ctxt, cptr, *t_window, visibility_type, thisstack == True);`
`750`	`750`	`else`
`751`		`- MCInterfaceExecGoCardAsMode(ctxt, cptr, mode, visibilityType, thisstack == True);`
	`751`	`+ MCInterfaceExecGoCardAsMode(ctxt, cptr, mode, visibility_type, thisstack == True);`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`MCHide::~MCHide()`
Original file line number	Diff line number	Diff line change
`@@ -4576,8 +4576,7 @@ void MCInterfaceExecGoHome(MCExecContext& ctxt, MCCard *p_card)`
`4576`	`4576`	`MCdefaultstackptr->close();`
`4577`	`4577`	`MCdefaultstackptr->checkdestroy();`
`4578`	`4578`	`}`
`4579`		`- MCInterfaceExecGoVisibility visibilityType = kMCInterfaceExecGoVisibilityImplicit;`
`4580`		`- MCInterfaceExecGo(ctxt, p_card, nil, 0, false, visibilityType);`
	`4579`	`+ MCInterfaceExecGo(ctxt, p_card, nil, 0, false, MCInterfaceExecGoVisibility(kMCInterfaceExecGoVisibilityImplicit));`
`4581`	`4580`	`}`
`4582`	`4581`
`4583`	`4582`	`////////////////////////////////////////////////////////////////////////////////`