aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph-Eugene Winzer2017-08-04 11:37:31 +0200
committerThierry Crozat2018-01-23 01:01:18 +0000
commit48870921f09d126a3084f12e265719bdd97e9bb3 (patch)
tree3b00147b3e6f79beaaddc562b43e56c8e8fff437
parent172377f09334d5d267b1d143014763f57a2b498f (diff)
downloadscummvm-rg350-48870921f09d126a3084f12e265719bdd97e9bb3.tar.gz
scummvm-rg350-48870921f09d126a3084f12e265719bdd97e9bb3.tar.bz2
scummvm-rg350-48870921f09d126a3084f12e265719bdd97e9bb3.zip
SUPERNOVA: Implements shock() and removes longjmps to 'dead'
-rw-r--r--engines/supernova/state.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index 9a8bba382c..90ca7ab74f 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -713,9 +713,8 @@ void GameManager::palette() {
}
void GameManager::shock() {
- // STUB
_vm->playSound(kAudioShock);
- // die
+ death("Du h\204ttest besser vorher|den Stecker rausgezogen.");
}
void GameManager::showMenu() {
@@ -1130,8 +1129,7 @@ bool GameManager::genericInteract(Action verb, Object &obj1, Object &obj2) {
} else {
if (obj1.hasProperty(WORN)) {
if (airless()) {
- //TODO: Death screen
-// longjmp(dead, "Den Helm h„ttest du|besser angelassen!");
+ death("Den Helm h\204ttest du|besser angelassen!");
}
obj1.disableProperty(WORN);
_vm->renderMessage("Du ziehst den Helm ab.");
@@ -1158,8 +1156,7 @@ bool GameManager::genericInteract(Action verb, Object &obj1, Object &obj2) {
} else {
if (obj1.hasProperty(WORN)) {
if (airless()) {
- //TODO: Death screen
-// longjmp(dead, "Den Versorungsteil h„ttest du|besser nicht abgenommen!");
+ death("Den Versorgungsteil h\204ttest du|besser nicht abgenommen!");
}
obj1.disableProperty(WORN);
_vm->renderMessage("Du nimmst den Versorgungsteil ab.");