From b3e8bfbf38051e9ad6cbe6729cbcf1fcc83354cf Mon Sep 17 00:00:00 2001
From: Raffael Di Pietro <maxou4170@gmail.com>
Date: Tue, 30 Mar 2021 18:21:00 +0200
Subject: [PATCH] Correction de warning et d'erreurs (j'aime pas le rouge dans
 la console mdr)

---
 Assets/Scripts/Inventory/Border.cs | 4 ++--
 Assets/Scripts/Inventory/Item.cs   | 2 +-
 Assets/Scripts/Scene/loadScene.cs  | 4 ++--
 Assets/Shopping.cs                 | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Assets/Scripts/Inventory/Border.cs b/Assets/Scripts/Inventory/Border.cs
index 90217c7..aa12705 100644
--- a/Assets/Scripts/Inventory/Border.cs
+++ b/Assets/Scripts/Inventory/Border.cs
@@ -5,7 +5,7 @@ using UnityEngine;
 public class Border : MonoBehaviour
 {
     public Item itemNeeded;
-    public BoxCollider2D collider;
+    public BoxCollider2D forestCollider;
 
     private void OnCollisionEnter2D(Collision2D collision)
     {
@@ -16,7 +16,7 @@ public class Border : MonoBehaviour
             if (Inventory.instance.hasItem(itemNeeded))
             {
                 Debug.Log("Je possède l'item nécessaire");
-                collider.enabled = false;
+                forestCollider.enabled = false;
 
             }
             else
diff --git a/Assets/Scripts/Inventory/Item.cs b/Assets/Scripts/Inventory/Item.cs
index e927be8..cbaebf4 100644
--- a/Assets/Scripts/Inventory/Item.cs
+++ b/Assets/Scripts/Inventory/Item.cs
@@ -6,7 +6,7 @@ using UnityEngine;
 public class Item : ScriptableObject {
     
     public int id;
-    public string name;
+    public string nom;
     public string description;
     public Sprite image;
 
diff --git a/Assets/Scripts/Scene/loadScene.cs b/Assets/Scripts/Scene/loadScene.cs
index 4dce656..d447b00 100644
--- a/Assets/Scripts/Scene/loadScene.cs
+++ b/Assets/Scripts/Scene/loadScene.cs
@@ -14,14 +14,14 @@ public class loadScene : MonoBehaviour
 
     public string scene;
     public Animator animmator;
-    public string name;
+    public string nom;
 
 
     public void ChargerScene()
     {
         animmator.SetBool("Change", true);
         year.text = "" + nextYear;
-        city.text = name;
+        city.text = nom;
         StartCoroutine(nextLevelTimer());
     }
 
diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs
index ad98488..1fc1c33 100644
--- a/Assets/Shopping.cs
+++ b/Assets/Shopping.cs
@@ -36,7 +36,6 @@ public class Shopping : MonoBehaviour
                     break;
             }
             Inventory.instance.addItem(sellItem);
-            Destroy(itemForSale[0]);
             Debug.Log(sellItem.name.ToString() + " a bien ete ajouté a l'inventaire");
         }
     }
-- 
GitLab