Migration vers python 3.6 / Fixation du bug sur le Global statement

gabeta · Nov 17, 2017 · d3ccc12 · d3ccc12
1 parent c9756c9
commit d3ccc12
Show file tree

Hide file tree

Showing 11 changed files with 193 additions and 193 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/point_point.iml b/.idea/point_point.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Environnement/__pycache__/pivot.cpython-36.pyc b/Environnement/__pycache__/pivot.cpython-36.pyc
diff --git a/Environnement/__pycache__/player.cpython-36.pyc b/Environnement/__pycache__/player.cpython-36.pyc
diff --git a/Environnement/__pycache__/terrain.cpython-36.pyc b/Environnement/__pycache__/terrain.cpython-36.pyc
diff --git a/IA/__pycache__/IrisIA.cpython-36.pyc b/IA/__pycache__/IrisIA.cpython-36.pyc
diff --git a/IA/__pycache__/irisCpIA.cpython-36.pyc b/IA/__pycache__/irisCpIA.cpython-36.pyc
diff --git a/point.py b/point.py
@@ -37,6 +37,7 @@
 #Crétation de la plateform de jeu
 def create_plateform():
 
+    global begin
 
     if(begin is False):
         d = 0
@@ -46,7 +47,6 @@ def create_plateform():
         terrain.horizontalLine()
         terrain.verticalLine()
 
-        global begin
         begin = True
 
 #Marquer un point en faisant un carré
@@ -111,6 +111,8 @@ def makeCarre(x,y):
 #Création du point
 def point(event):
 
+    global current_p
+
     if(begin):
 
         if(terrain.overFlow(event.y,event.x) & terrain.checkRayon(event.y,event.x)):
@@ -134,11 +136,9 @@ def point(event):
                 makeCarre(event.x,event.y)
 
                 if(current_p == P1):
-                    global current_p
                     current_p = P2
                     next_color = "rouge"
                 else:
-                    global current_p
                     current_p = P1
                     next_color = "bleu"
 

diff --git a/vsCpIris.py b/vsCpIris.py
@@ -42,6 +42,8 @@
 #Crétation de la plateform de jeu
 def create_plateform():
 
+    global begin
+
     if(begin is False):
         d = 0
         info.configure(text = "Joueur Bleu  = " + str(P1.getScore()))
@@ -50,7 +52,6 @@ def create_plateform():
         terrain.horizontalLine()
         terrain.verticalLine()
 
-        global begin
         begin = True
 
 #Marquer un point en faisant un carré
@@ -115,6 +116,8 @@ def makeCarre(x,y):
 #Au tour de l'utilisateur de jouer
 def point(event):
 
+    global current_p
+
     if (begin) & (current_p == P1):
 
         if(terrain.overFlow(event.y,event.x) & terrain.checkRayon(event.y,event.x)):
@@ -139,14 +142,15 @@ def point(event):
                 P2.setOtherDico(value,current_p.getColor())
                 P2.updateRandomList(value)
 
-                global current_p
                 current_p = P2
 
                 IAtour()
 
 #Au tour de l'IA de jouer.
 def IAtour():
 
+    global current_p
+
     if(len(P2.getOwnDico()) == 0):
 
         #Début du jeu faire un point aléatoire
@@ -210,7 +214,6 @@ def IAtour():
     makeCarre(x,y)
 
     #Donner la main à l'utilisateur
-    global current_p
     current_p = P1
 
 #Corps principale du programme