diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-12 00:33:19 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-12 00:33:19 -0500 |
| commit | 5ecd0f428dd8292a17c5013c525a4f5d3967acb8 (patch) | |
| tree | 0068b66a1183f822909f115a142fae3869a3b09f /src/character_system.cpp | |
| parent | 19be2ac58b09c5240a32e6a4f41cd9f6cda03d07 (diff) | |
| download | tanetane-5ecd0f428dd8292a17c5013c525a4f5d3967acb8.tar.gz tanetane-5ecd0f428dd8292a17c5013c525a4f5d3967acb8.tar.bz2 tanetane-5ecd0f428dd8292a17c5013c525a4f5d3967acb8.zip | |
Scripts are organised per-map now
Diffstat (limited to 'src/character_system.cpp')
| -rw-r--r-- | src/character_system.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/src/character_system.cpp b/src/character_system.cpp index aad8c1b..a0572b0 100644 --- a/src/character_system.cpp +++ b/src/character_system.cpp | |||
| @@ -92,7 +92,7 @@ void CharacterSystem::tick(double dt) { | |||
| 92 | Sprite& collider = game_.getSprite(collision.horiz.colliderSprite); | 92 | Sprite& collider = game_.getSprite(collision.horiz.colliderSprite); |
| 93 | 93 | ||
| 94 | if (collider.walkthroughScript != "") { | 94 | if (collider.walkthroughScript != "") { |
| 95 | game_.getSystem<ScriptSystem>().runScript(collider.walkthroughScript); | 95 | game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.walkthroughScript); |
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| 98 | 98 | ||
| @@ -102,7 +102,7 @@ void CharacterSystem::tick(double dt) { | |||
| 102 | Sprite& collider = game_.getSprite(collision.vert.colliderSprite); | 102 | Sprite& collider = game_.getSprite(collision.vert.colliderSprite); |
| 103 | 103 | ||
| 104 | if (collider.walkthroughScript != "") { | 104 | if (collider.walkthroughScript != "") { |
| 105 | game_.getSystem<ScriptSystem>().runScript(collider.walkthroughScript); | 105 | game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.walkthroughScript); |
| 106 | } | 106 | } |
| 107 | } | 107 | } |
| 108 | 108 | ||