names shadowing fix

needed after exposing 'name' and 'owner' properties of Node (in the engine)
kubecz3k · Jan 20, 2018 · 6492c53 · 6492c53
1 parent ac00b3b
commit 6492c53
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/addons/net.kivano.fsm/content/FSMGraph/FSMGraphUI/NewElementBtn/NewElementBtn.gd b/addons/net.kivano.fsm/content/FSMGraph/FSMGraphUI/NewElementBtn/NewElementBtn.gd
@@ -37,7 +37,8 @@ func _notification(what):
 		conditionOptions = get_node("conditionOptions");
 		conditionOptions.clear()
 		conditionOptions.add_item("New condition", 0);
-#		conditionOptions.add_item("Choose existing",1); #disabled for now, there is some nasty issue with this after 3.0 converting
+		conditionOptions.add_item("Choose existing",1);
+		pass #all internal initialization
 	elif(what == NOTIFICATION_READY):
 		hide();
 

diff --git a/addons/net.kivano.fsm/content/FSMGraph/GraphNode/GraphNode.gd b/addons/net.kivano.fsm/content/FSMGraph/GraphNode/GraphNode.gd
@@ -25,7 +25,7 @@ signal connectionRemoveRequest(inSource, inTarget);
 const TYPE_STATE = 1;
 const TYPE_TRANSITION = 2;
 
-export (String) var name = "STATE NAME" setget setName;
+export (String) var stateName = "STATE NAME" setget setName;
 
 onready var title = get_node("title");
 onready var dragArrow = get_node("arrows/dragArrow");

diff --git a/addons/net.kivano.fsm/content/fsm.gd b/addons/net.kivano.fsm/content/fsm.gd
@@ -367,11 +367,12 @@ func removeConnection2TransitionFromState(inStateID, inTransitionID):
 func addTransitionBetweenStatesIDs(inSourceStateID, inTargetStateID, inTransitionID):
 	#assert: you should create transition from inspector first! (don't make a lot of sense to create it from code:
 	#you will need to implement custom transition logic anyway)
-	assert transitionsNode.has_node(inTransitionID);
-	var transitionNode = transitionsNode.get_node(inTransitionID);
+	assert allTransitions.has(inTransitionID);
+	var transitionNode = allTransitions[inTransitionID];
 	transitionNode.addSourceStateNode(statesNode.get_node(inSourceStateID));
 	transitionNode.setTargetStateNode(statesNode.get_node(inTargetStateID));
 
+
 #### History
 #######
 func archiveStateInHistory(inState2Archive):
@@ -504,7 +505,7 @@ func createElement(inElementName, inHolderNode, inElementsSubfolder, inTemplateS
 	if (inElementName==null) || (inElementName.empty()) || has_node(inElementName): return;
 
 	#
-	var owner = get_owner();
+	var lowner = get_owner();
 
 	#
 	var dirMaker = Directory.new();
@@ -536,8 +537,8 @@ func createElement(inElementName, inHolderNode, inElementsSubfolder, inTemplateS
 	scn2Add.set_owner(get_tree().get_edited_scene_root());
 
 func getFolderFilepath4Element(inElementID, inElementsSubdir):
-	var owner = get_owner();
-	var dirPath = owner.get_filename().get_base_dir();
+	var lowner = get_owner();
+	var dirPath = lowner.get_filename().get_base_dir();
 	if(additionalSubDirectory4FSMData!=""):
 		dirPath = dirPath + "/" +additionalSubDirectory4FSMData + "/" + inElementsSubdir + "/" + inElementID;
 	else:

diff --git a/addons/net.kivano.fsm/plugin.cfg b/addons/net.kivano.fsm/plugin.cfg
@@ -3,5 +3,5 @@
 name="FSM (Finite State Machine)"
 description="Finite State Machine"
 author="Jakub Grzesik"
-version="1.0.3 alpha"
+version="1.0.4 alpha"
 script="FSMInitScript.gd"