From 34e4192964cbe370b05cbebaf3b434a22278e753 Mon Sep 17 00:00:00 2001 From: vaguerant Date: Sun, 30 Jun 2019 20:35:11 +1000 Subject: [PATCH 1/2] Tweaks to English subtitles, including line breaks to suit 640-wide (#193) --- src/lang/en.h | 52 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/lang/en.h b/src/lang/en.h index 4c0b8b2..88ec7ef 100644 --- a/src/lang/en.h +++ b/src/lang/en.h @@ -127,12 +127,12 @@ const char *STR_EN[] = { "" , "Pyramid Key" // TR1 subtitles /* CAFE */ , - "[43500]What's a man gotta do to@get that kinda attention from ya?" + "[43500]What's a man gotta do to@get that kinda attention from ye?" "[47500]It's hard to say exactly,@but you seem to be doing fine." - "[50000]Well, great. Though, truth is,@it ain't me that wants ya." + "[50000]Well, great. Though, truth is,@it ain't me that wants ye." "[54500]No?" "[55000]No. Miss Jacqueline Natla does,@from Natla Technologies." - "[59000]You know, creator of@all things bright and beautiful." + "[59000]You know, creator of@all things bright and beautiful?" "[64500]Seal it, Larson." "[66000]Ma'am." "[68000]Feast your eyes on this, Lara." @@ -140,7 +140,7 @@ const char *STR_EN[] = { "" "[73500]I'm sorry. I only play for sport." "[76000]Then you'll like a big park." "[78000]Peru. Vast mountain ranges to cover.@Sheer walls of ice. Rocky crags. Savage winds." - "[87500]And there's this little trinket:@An age old artefact of mystical powers" + "[87500]And there's this little trinket:@an age old artefact of mystical powers" "[92500]buried in the unfound tomb of Qualopec." "[96000]That's my interest." "[98000]You could leave tomorrow.@Are you busy tomorrow?" @@ -174,7 +174,7 @@ const char *STR_EN[] = { "" "[65000]" "[136000]What the heck was that?" "[138000]What?" - "[138500]That." + "[138500]That-a-way." "[140500]Probably just a fish." "[142500]That's some fish, kid." "[145000]Man, you have got to learn to chill.@I'm going back inside. You coming?" @@ -185,10 +185,10 @@ const char *STR_EN[] = { "" /* PRISON */ , "[00001]You can't do this!" "[01500]We condemn you, Natla of Atlantis, for your crimes." - "[06000]For your flagrant misuse of your powers@and for robbing us of our." + "[06000]For the flagrant misuse of your powers@and for robbing us of our..." "[11500]You can't! I..." "[12500]Breaking the free bond of consent that our@people are ruled and secured under," - "[18500]and invading Tihocan and myself with our own army." + "[18500]and invading Tihocan and myself with our army." "[23500]Our warriors emptied from our pyramid" "[27000]so that you could use the pyramid - its powers@of creation - for your own mindless destruction." "[33500]Mindless!? Look at you!" @@ -196,7 +196,7 @@ const char *STR_EN[] = { "" "[40500]Wasters!" "[41500]Let's just do it." "[44000]Tihocan!" - "[45000]You used the sacramental place as a source@for your individual pleasure," + "[45000]You used the sacramental place as a source@of individual pleasure," "[49500]as some freak factory." "[51000]They're survivalists. A new generation." "[54000]A slaughter heap now." @@ -207,12 +207,12 @@ const char *STR_EN[] = { "" "[73000]You won't rest either, or your@damned continent of Atlantis!" /* 22 */ , "[04000]Back again?" - "[05500]And you - for a grand re-opening I assume." + "[05500]And you - for a grand re-opening, I assume." "[09500]Evolution's in a rut - natural selection at an all time low..." "[13500]shipping out fresh meat will incite territorial rages again" "[17500] - will strengthen and advance us..." "[20500]Even create new breeds." - "[22500]Kind of like evolution on steroids then." + "[22500]Kind of evolution on steroids, then." "[24500]A kick in the pants...@those runts Qualopec and Tihocan had no idea" "[29500] - the cataclysm of Atlantis struck a race of langouring wimps..." "[33500]plummeted them to the very basics of survival again..." @@ -228,22 +228,22 @@ const char *STR_EN[] = { "" "[60000]ONE..." /* 23 */ , "[00001]Well, you have my total attention now" - "[02500]I'm not quite sure if I've got yours though" - "[05000]hello?" - "[06000]I'll heel an' hide ye to a barn door yit" - "[09000]Of course" + "[02500]- I'm not quite sure if I've got yours, though." + "[05000]Hello?" + "[06000]I'll heel an' hide ye to a barn door yit." + "[09000]Of course." "[10000]Ye and that drivelin' piece of the Scion." "[13000]Ye want to keep it so bad, I'll harness it right up y..." "[17000]Wait... we're talking about the artifact here?" "[20000]Damn straight we are ... right up y ..." "[22000]Hold on - I'm sorry" - "[24000]this piece you say - where's the rest?" - "[26500]Ms Natla put Pierre Dupont on that trail." + "[24000]- this piece, you say - where's the rest?" + "[26500]Ms. Natla put Pierre Dupont on that trail." "[29500]And where is that?" "[30500]Hah. Ye ain't fast enough fer him." "[34000]So you think all this talking is just holding me up?" - "[37000]I don't know where his little jackrabbit-frog-legs are runnin' him to" - "[42000]You'll have to ask Ms. Natla" + "[37000]I don't know where his little jackrabbit-frog-legs are runnin' him to." + "[42000]You'll have to ask Ms. Natla." "[46000]" "[51000]Thank you. I will." /* 24 */ , "" @@ -257,22 +257,22 @@ const char *STR_EN[] = { "" /* 26 */ , "Welcome to my home!@I'll take you on a guided tour." /* 27 */ , "Use the directional buttons to go into the music room." /* 28 */ , "OK. Let's do some tumbling.@Press the jump button." - /* 29 */ , "Now press it again and press one of@the directions and I'll jump that way." + /* 29 */ , "Now press it again and quickly press one of@the directions and I'll jump that way." /* 30 */ , "Ah, the main hall.@Sorry about the crates, I'm having some things put@ into storage and the delivery people haven't been yet." - /* 31 */ , "Run up to a crate, and while still pressing forwards@press action, and I'll vault up onto it." - /* 32 */ , "This used to be the ballroom, but I've converted it into my own personal gym.@What do you think?@Well, let's do some exercises." + /* 31 */ , "Run up to a crate, and while still pressing forward,@press action, and I'll vault up onto it." + /* 32 */ , "This used to be the ballroom, but I've@converted it into my own personal gym.@What do you think?@Well, let's do some exercises." /* 33 */ , "I don't actually run everywhere.@When I want to be careful, I walk.@Hold down the walk button, and walk to the white line." /* 34 */ , "With the walk button down, I won't fall off even if you try to make me.@Go on, try it." /* 35 */ , "If you want look around, press and hold the look button.@Then press in the direction you want to look." - /* 36 */ , "If a jump is too far for me, I can grab the ledge and save myself from a nasty fall.@Walk to the edge with the white line until I won't go any further.@Then press jump immediately followed by forwards then while @I'm in the air press and hold the action button." + /* 36 */ , "If a jump is too far for me, I can grab the ledge and save myself@from a nasty fall. Walk to the edge with the white line until I@won't go any further. Then press jump, immediately followed by@forward and while I'm in the air, press and hold the action button." /* 37 */ , "Press forward and I'll climb up." /* 38 */ , "If I do a running jump, I can make a jump like that, no problem." /* 39 */ , "Walk to the edge with the white line until I stop.@Then let go of walk and tap backwards to give me a run up.@Press forward, and almost immediately press and hold the jump button.@I won't actually jump until the last minute." /* 40 */ , "Right. This is a really big one.@So do a running jump exactly as before except while I'm in the air@press and hold the action button to make me grab the ledge." /* 41 */ , "Nice." - /* 42 */ , "Try to vault up here.@Press forwards and hold action." + /* 42 */ , "Try to vault up here.@Press forward and hold action." /* 43 */ , "I can't climb up because the gap is too small.@But press right and I'll shimmy sideways@until there is room, then press forward." - /* 44 */ , "Great!@If there is a long drop and I don't want to@hurt myself jumping off I can let myself down carefully." + /* 44 */ , "Great!@If there is a long drop and I don't want to@hurt myself jumping off, I can let myself down carefully." /* 45 */ , "Tap backwards, and I'll jump off backwards.@Immediately press and hold the action button,@and I'll grab the ledge on the way down." /* 46 */ , "Then let go." /* 47 */ , "Let's go for a swim." @@ -283,8 +283,8 @@ const char *STR_EN[] = { "" /* 52 */ , "Ain't nothin' personal." /* 53 */ , "I still git a pain in my brain from ye.@An' it's tellin' me funny ideas now.@Like to shoot you to hell!" /* 54 */ , "You can't bump off me and my brood so easy, Lara." - /* 55 */ , "A leetle late for the prize giving - non?@Still, it is the taking-part wheech counts." - /* 56 */ , "You firin' at me?@You firin' at me, huh?@Ain't nobody else, so you must be firin' at me!" + /* 55 */ , "A leetle late for ze prize giving - non?@Still, it is ze taking-part wheech counts." + /* 56 */ , "You firin' at me?@You firin' at me, huh?@Ain't nobody else here, you must be firin' at me!" // TR1 levels , "Lara's Home" , "Caves" From 8d9f4867e2deea54ab622c99a98372c60fd050bb Mon Sep 17 00:00:00 2001 From: vaguerant Date: Fri, 5 Jul 2019 09:34:05 +1000 Subject: [PATCH 2/2] Fix renderbar position on save game screen (#194) --- src/inventory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inventory.h b/src/inventory.h index b9e8339..18288da 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -2025,7 +2025,7 @@ struct Inventory { if (page == PAGE_SAVEGAME) { UI::renderBar(CTEX_OPTION, vec2(UI::width / 2 - 120, 240 - 14), vec2(240, LINE_HEIGHT - 6), 1.0f, 0x802288FF, 0, 0, 0); UI::textOut(vec2(0, 240), pageTitle[page], UI::aCenter, UI::width); - UI::renderBar(CTEX_OPTION, vec2(slot + UI::width / 2 - 48, 240 + 24 - 16), vec2(48, 18), 1.0f, 0xFFD8377C, 0); + UI::renderBar(CTEX_OPTION, vec2(-slot * 48 + UI::width / 2, 240 + 24 - 16), vec2(48, 18), 1.0f, 0xFFD8377C, 0); UI::textOut(vec2(UI::width / 2 - 48, 240 + 24), STR_YES, UI::aCenter, 48); UI::textOut(vec2(UI::width / 2, 240 + 24), STR_NO, UI::aCenter, 48); return;