From 5ecd0f428dd8292a17c5013c525a4f5d3967acb8 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 12 Feb 2021 00:33:19 -0500
Subject: Scripts are organised per-map now

---
 src/input_system.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/input_system.cpp')

diff --git a/src/input_system.cpp b/src/input_system.cpp
index 6ee442a..2201907 100644
--- a/src/input_system.cpp
+++ b/src/input_system.cpp
@@ -54,7 +54,7 @@ void InputSystem::tick(double dt) {
 
                 Sprite& collider = game_.getSprite(collision.horiz.colliderSprite);
                 if (collider.interactionScript != "") {
-                  game_.getSystem<ScriptSystem>().runScript(collider.interactionScript);
+                  game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.interactionScript);
                   activated = true;
                 }
               } else if (collision.vert.colliderSprite != -1) {
@@ -62,7 +62,7 @@ void InputSystem::tick(double dt) {
 
                 Sprite& collider = game_.getSprite(collision.vert.colliderSprite);
                 if (collider.interactionScript != "") {
-                  game_.getSystem<ScriptSystem>().runScript(collider.interactionScript);
+                  game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.interactionScript);
                   activated = true;
                 }
               }
@@ -70,7 +70,7 @@ void InputSystem::tick(double dt) {
           }
 
           if (inFrontOfSomething && !activated) {
-            game_.getSystem<ScriptSystem>().runScript("default");
+            game_.getSystem<ScriptSystem>().runScript("global", "no_problem_here");
           }
         }
       } else if (e.key.keysym.sym == SDLK_LEFT) {
-- 
cgit 1.4.1