From 139fe8bd9e52314b58a3b87b722651fec1b63ffa Mon Sep 17 00:00:00 2001 From: onpon4 Date: Sat, 28 Mar 2015 22:33:11 -0400 Subject: [PATCH] Some small tweaks/fixes. --- data/cutscene4.dat | 2 +- data/script11.txt | 4 ++-- src/collectable.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/cutscene4.dat b/data/cutscene4.dat index 3b39582..9482192 100644 --- a/data/cutscene4.dat +++ b/data/cutscene4.dat @@ -24,7 +24,7 @@ We took down the WEAPCO mining vessel and then I was jumped by a man claiming to FACE_SID I've heard of him. He's the Commander of WEAPCO's naval forces. One of the best pilots they ever had. FACE_CHRIS -He did put up one hell of a fight. He didn't stick around for long, though. I guess he was testing me. +He did put up one hell of a fight. He didn't stick around for long, though. I guess he was just testing me. FACE_CHRIS We've still got a job to do. What did you find out about Mordor? FACE_SID diff --git a/data/script11.txt b/data/script11.txt index 3f76612..3da9b68 100644 --- a/data/script11.txt +++ b/data/script11.txt @@ -52,11 +52,11 @@ FACE_KLINE 0 I am Kline Kethlan. And I am here to put to a stop to your worthless little crusade! --35 +-36 FACE_KLINE -1 0 -No where to run; No where to hide; And no-one to help you! This will certainly be interesting... +Nowhere to run, nowhere to hide, and no one to help you! This will certainly be interesting... -41 -1 diff --git a/src/collectable.cpp b/src/collectable.cpp index 1d8bb60..b074f49 100644 --- a/src/collectable.cpp +++ b/src/collectable.cpp @@ -280,6 +280,7 @@ void doCollectables() collectables *collectable = engine.collectableHead; collectables *prevCollectable = engine.collectableHead; engine.collectableTail = engine.collectableHead; + char temp[40]; while (collectable->next != NULL) { @@ -302,7 +303,6 @@ void doCollectables() if ((player.shield > 0) && (collision(collectable, &player))) { - char temp[40]; switch(collectable->type) { case P_CASH: @@ -353,7 +353,7 @@ void doCollectables() } else { - sprintf(temp, "Plasma ammo unavailable"); + sprintf(temp, "Upgrade failed (no plasma ammo)"); } break; @@ -378,7 +378,7 @@ void doCollectables() } else { - sprintf(temp, "Plasma ammo unavailable"); + sprintf(temp, "Upgrade failed (no plasma ammo)"); } break; @@ -402,7 +402,7 @@ void doCollectables() } else { - sprintf(temp, "Plasma ammo unavailable"); + sprintf(temp, "Upgrade failed (no plasma ammo)"); } break; @@ -426,7 +426,7 @@ void doCollectables() } else { - sprintf(temp, "Plasma ammo unavailable (damn!)"); + sprintf(temp, "Damn! Upgrade failed (no plasma ammo)"); } break;