walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some small tweaks/fixes.

This commit is contained in:
onpon4 2015-03-28 22:33:11 -04:00
parent 4a72111a46
commit 139fe8bd9e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/cutscene4.dat
View File

@ -24,7 +24,7 @@ We took down the WEAPCO mining vessel and then I was jumped by a man claiming to
FACE_SID FACE_SID
I've heard of him. He's the Commander of WEAPCO's naval forces. One of the best pilots they ever had. I've heard of him. He's the Commander of WEAPCO's naval forces. One of the best pilots they ever had.
FACE_CHRIS 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 FACE_CHRIS
We've still got a job to do. What did you find out about Mordor? We've still got a job to do. What did you find out about Mordor?
FACE_SID FACE_SID

4
data/script11.txt
View File

@ -52,11 +52,11 @@ FACE_KLINE
0 0
I am Kline Kethlan. And I am here to put to a stop to your worthless little crusade! I am Kline Kethlan. And I am here to put to a stop to your worthless little crusade!
-35 -36
FACE_KLINE FACE_KLINE
-1 -1
0 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 -41
-1 -1

10
src/collectable.cpp
View File

@ -280,6 +280,7 @@ void doCollectables()
collectables *collectable = engine.collectableHead; collectables *collectable = engine.collectableHead;
collectables *prevCollectable = engine.collectableHead; collectables *prevCollectable = engine.collectableHead;
engine.collectableTail = engine.collectableHead; engine.collectableTail = engine.collectableHead;
char temp[40];
while (collectable->next != NULL) while (collectable->next != NULL)
{ {
@ -302,7 +303,6 @@ void doCollectables()
if ((player.shield > 0) && (collision(collectable, &player))) if ((player.shield > 0) && (collision(collectable, &player)))
{ {
char temp[40];
switch(collectable->type) switch(collectable->type)
{ {
case P_CASH: case P_CASH:
@ -353,7 +353,7 @@ void doCollectables()
} }
else else
{ {
sprintf(temp, "Plasma ammo unavailable"); sprintf(temp, "Upgrade failed (no plasma ammo)");
} }
break; break;
@ -378,7 +378,7 @@ void doCollectables()
} }
else else
{ {
sprintf(temp, "Plasma ammo unavailable"); sprintf(temp, "Upgrade failed (no plasma ammo)");
} }
break; break;
@ -402,7 +402,7 @@ void doCollectables()
} }
else else
{ {
sprintf(temp, "Plasma ammo unavailable"); sprintf(temp, "Upgrade failed (no plasma ammo)");
} }
break; break;
@ -426,7 +426,7 @@ void doCollectables()
} }
else else
{ {
sprintf(temp, "Plasma ammo unavailable (damn!)"); sprintf(temp, "Damn! Upgrade failed (no plasma ammo)");
} }
break; break;