aboutsummaryrefslogtreecommitdiff
path: root/src/scalevalapokalypsi/Model/Entities
diff options
context:
space:
mode:
authorJoel Kronqvist <joel.kronqvist@iki.fi>2024-11-21 23:19:00 +0200
committerJoel Kronqvist <joel.kronqvist@iki.fi>2024-11-21 23:19:00 +0200
commit49985d1d11c426968fc298469671326aace96d00 (patch)
tree1d6eacf11e0791a93c216ecfeca4a5d71602f1ee /src/scalevalapokalypsi/Model/Entities
parent607b43a84d3bc8edffa05c722c7b8c3e6f72e964 (diff)
downloadscalevalapokalypsi-49985d1d11c426968fc298469671326aace96d00.tar.gz
scalevalapokalypsi-49985d1d11c426968fc298469671326aace96d00.zip
Fixed singing from last commit
Diffstat (limited to 'src/scalevalapokalypsi/Model/Entities')
-rw-r--r--src/scalevalapokalypsi/Model/Entities/Entity.scala5
-rw-r--r--src/scalevalapokalypsi/Model/Entities/Player.scala2
2 files changed, 1 insertions, 6 deletions
diff --git a/src/scalevalapokalypsi/Model/Entities/Entity.scala b/src/scalevalapokalypsi/Model/Entities/Entity.scala
index e7cd45c..0427297 100644
--- a/src/scalevalapokalypsi/Model/Entities/Entity.scala
+++ b/src/scalevalapokalypsi/Model/Entities/Entity.scala
@@ -58,10 +58,7 @@ class Entity(
("Olet täysin kunnossa.", s"$name näyttää kuin vastasyntyneeltä.")
/** Does nothing, except possibly in inherited classes. */
- def observeString(observation: String): Unit =
- println(" [debug] entity got observation string & discarded it")
- def observe(event: Event): Unit =
- println(" [debug] entity got observation event & discarded it")
+ def observe(event: Event): Unit = ()
/** Returns the player’s current location. */
def location = this.currentLocation
diff --git a/src/scalevalapokalypsi/Model/Entities/Player.scala b/src/scalevalapokalypsi/Model/Entities/Player.scala
index cac5bf1..a66f521 100644
--- a/src/scalevalapokalypsi/Model/Entities/Player.scala
+++ b/src/scalevalapokalypsi/Model/Entities/Player.scala
@@ -18,8 +18,6 @@ class Player(name: String, initialLocation: Area) extends Entity(name, initialLo
private val observedEvents: Buffer[Event] = Buffer.empty
private var pendingSingEffect: Option[SingEffect] = None
- override def observeString(observation: String): Unit =
- this.observations.append(observation)
override def observe(event: Event): Unit =
this.observedEvents.append(event)