From cc92cb7b7f9b87cb791c504bf930d622d74db368 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 30 Nov 2016 21:16:49 +0100 Subject: [PATCH] DialogBox is protected on Windows, rename to DialogScene Also adapted variable names accordingly and even the fields in the dialog data files. --- Data/Dialogues/Endgood.txt | 12 +++--- Data/Dialogues/Endharsh.txt | 14 +++---- Data/Dialogues/Example.txt | 16 ++++---- Data/Dialogues/alphawolf.txt | 16 ++++---- Data/Dialogues/ambush.txt | 16 ++++---- Data/Dialogues/april.txt | 24 +++++------ Data/Dialogues/april2.txt | 12 +++--- Data/Dialogues/aprilgerm.txt | 24 +++++------ Data/Dialogues/clover.txt | 14 +++---- Data/Dialogues/clover2.txt | 18 ++++----- Data/Dialogues/guard.txt | 10 ++--- Data/Dialogues/guards.txt | 20 ++++----- Data/Dialogues/jack.txt | 16 ++++---- Data/Dialogues/jack2.txt | 18 ++++----- Data/Dialogues/jack3.txt | 20 ++++----- Data/Dialogues/jack4.txt | 26 ++++++------ Data/Dialogues/jackguards.txt | 6 +-- Data/Dialogues/king.txt | 20 ++++----- Data/Dialogues/king2.txt | 20 ++++----- Data/Dialogues/protest.txt | 12 +++--- Data/Dialogues/raidercamp.txt | 6 +-- Data/Dialogues/raiderchief.txt | 26 ++++++------ Data/Dialogues/raiderguard.txt | 6 +-- Data/Dialogues/raiders.txt | 10 ++--- Data/Dialogues/raiderscout.txt | 4 +- Data/Dialogues/raiderscout2.txt | 14 +++---- Data/Dialogues/skipper.txt | 16 ++++---- Data/Dialogues/skipper2.txt | 18 ++++----- Data/Dialogues/skipper3.txt | 20 ++++----- Data/Dialogues/trixie.txt | 12 +++--- Data/Dialogues/trixie2.txt | 16 ++++---- Data/Dialogues/turner.txt | 12 +++--- Data/Dialogues/turner10.txt | 12 +++--- Data/Dialogues/turner2.txt | 6 +-- Data/Dialogues/turner3.txt | 6 +-- Data/Dialogues/turner4.txt | 6 +-- Data/Dialogues/turner5.txt | 4 +- Data/Dialogues/turner6.txt | 16 ++++---- Data/Dialogues/turner7.txt | 6 +-- Data/Dialogues/turner8.txt | 28 ++++++------- Data/Dialogues/turner81.txt | 20 ++++----- Data/Dialogues/turner82.txt | 10 ++--- Data/Dialogues/turner9.txt | 16 ++++---- Data/Dialogues/wolfpatrol.txt | 8 ++-- Source/ConsoleCmds.cpp | 2 +- Source/Dialog.cpp | 38 ++++++++--------- Source/Dialog.h | 10 ++--- Source/Game.h | 2 +- Source/GameDraw.cpp | 22 +++++----- Source/GameTick.cpp | 72 ++++++++++++++++----------------- 50 files changed, 389 insertions(+), 389 deletions(-) diff --git a/Data/Dialogues/Endgood.txt b/Data/Dialogues/Endgood.txt index 3ebdcca..7c44ba5 100644 --- a/Data/Dialogues/Endgood.txt +++ b/Data/Dialogues/Endgood.txt @@ -1,34 +1,34 @@ -Dialogue boxes: 5 +Dialogue scenes: 5 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What harm could they possibly do? Sound: 6 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I defeated the wolves and bandits, and nobody is\going hungry. Sound: 1 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Their dissent will never gain any dangerous\momentum. Sound: 2 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.2 0.0 Name: Guard Text: Maybe he's not such an incompetent ruler\after all. Sound: 7 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.0 0.0 Name: Guard diff --git a/Data/Dialogues/Endharsh.txt b/Data/Dialogues/Endharsh.txt index cf2c04e..95c7223 100644 --- a/Data/Dialogues/Endharsh.txt +++ b/Data/Dialogues/Endharsh.txt @@ -1,41 +1,41 @@ -Dialogue Boxes: 6 +Dialogue Scenees: 6 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I killed them all. Sound: 6 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hopefully this will keep everyone else in line. Sound: 7 -Box 3: +Scene 3: Location: 2 Color: 0.2 0.0 0.0 Name: Guard Text: It is just as I feared. He is mad with power. Sound: 4 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.2 0.0 Name: Guard Text: Look at Fiver. his role model is corrupting him. Sound: 7 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.0 0.0 Name: Guard Text: Maybe we were better off with King Hickory. Sound: 5 -Box 6: +Scene 6: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver diff --git a/Data/Dialogues/Example.txt b/Data/Dialogues/Example.txt index 9eefdcb..b130afc 100644 --- a/Data/Dialogues/Example.txt +++ b/Data/Dialogues/Example.txt @@ -1,48 +1,48 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hi, Skipper! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: Hey, Turner! Sound: 7 -Box 3: +Scene 3: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: What's all this talk about hiring guards? Sound: 1 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: There's never been any trouble here while I've been in\charge! Sound: 4 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: The raiders are getting more confident... you never\know. Sound: 1 -Box 6: +Scene 6: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: I've seen you when you get mad; I think you could\take care of yourself. Sound: 6 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/alphawolf.txt b/Data/Dialogues/alphawolf.txt index 07e3f49..26c781c 100644 --- a/Data/Dialogues/alphawolf.txt +++ b/Data/Dialogues/alphawolf.txt @@ -1,48 +1,48 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 2 Color: 0.0 0.0 0.0 Name: Ash Text: I am the Alpha wolf, and you are just a little\herbivore. Do you really think you can kill me? Sound: 15 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.0 0.0 Name: Ash Text: Without your cowardly weapons you would stand no\chance. Sound: 9 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: ... Sound: 0 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.0 0.0 Name: Ash Text: If you defeat us you will overpopulate yourselves, and\bring on famine and civil war. Sound: 16 -Box 5: +Scene 5: Location: 2 Color: 0.0 0.0 0.0 Name: Ash Text: You will destroy the balance of nature and wreak havok\on this world. Sound: 10 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: If I fail, you will lose control again and kill all\the rabbits, and then starve to death. Sound: 2 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/ambush.txt b/Data/Dialogues/ambush.txt index 4e48360..3b25e0c 100644 --- a/Data/Dialogues/ambush.txt +++ b/Data/Dialogues/ambush.txt @@ -1,48 +1,48 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Where are we?############# Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.1 0.2 0.0 Name: Wanderer Text: We're almost there now. Sound: 5 -Box 3: +Scene 3: Location: 1 Color: 0.2 0.1 0.1 Name: Sarah Text: Turner! Sound: 4 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I have to go!############## Sound: 4 -Box 5: +Scene 5: Location: 2 Color: 0.1 0.2 0.0 Name: Wanderer Text: Not so fast. Sound: 8 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What?! Sound: 4 -Box 7: +Scene 7: Location: 2 Color: 0.0 0.0 0.0 Name: Raider diff --git a/Data/Dialogues/april.txt b/Data/Dialogues/april.txt index 0ecacf0..909db99 100644 --- a/Data/Dialogues/april.txt +++ b/Data/Dialogues/april.txt @@ -1,76 +1,76 @@ -Dialogue boxes: 11 +Dialogue scenes: 11 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, April! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Hi, dad! Sound: 7 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Why do you keep climbing up here? You're too old for\this. Sound: 1 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: These silly tricks are for kids. Sound: 6 -Box 5: +Scene 5: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: It's perfectly safe; I've seen you jump down from\here all the time. Sound: 1 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, it takes a lot of practice to do that... Sound: 4 -Box 7: +Scene 7: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Besides, I can see really far from up here! Sound: 1 -Box 8: +Scene 8: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: That guy over there is creeping me out though;\he looks like he's just waiting for something. Sound: 1 -Box 9: +Scene 9: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What guy?! Sound: 5 -Box 10: +Scene 10: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Over there! Sound: 6 -Box 11: +Scene 11: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/april2.txt b/Data/Dialogues/april2.txt index f52b432..6c0c0a8 100644 --- a/Data/Dialogues/april2.txt +++ b/Data/Dialogues/april2.txt @@ -1,34 +1,34 @@ -Dialogue boxes: 5 +Dialogue scenes: 5 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, April! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Hi, dad! Sound: 7 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I don't know who that was, but there may be more. Sound: 1 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Maybe you should stay up here for a while. Sound: 6 -Box 5: +Scene 5: Location: 2 Color: 0.4 0.2 0.2 Name: April diff --git a/Data/Dialogues/aprilgerm.txt b/Data/Dialogues/aprilgerm.txt index 88fc827..1c8df45 100644 --- a/Data/Dialogues/aprilgerm.txt +++ b/Data/Dialogues/aprilgerm.txt @@ -1,76 +1,76 @@ -Dialogue boxes: 11 +Dialogue scenes: 11 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, April! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Hallo Papa! ‡Ž’—œŠ‘•šŸ‰”™ž Sound: 7 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Warum kletterst du immernoch heir rum? Du bist zu alt dafŸr. Sound: 1 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Die billigen Tricks sind was fŸr Kinder. Sound: 6 -Box 5: +Scene 5: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Ich habe dich hier die ganze Zeit rumhŸpfen \gesehen. Sound: 1 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, du brauchst viel †bung um da zu machen... Sound: 4 -Box 7: +Scene 7: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Zudem hat man einen schšnen Ausblick von hier Oben! Sound: 1 -Box 8: +Scene 8: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Da hinten steht jemand der mir sorgen bereitet\er sieht so aus, als ob er auf etwas wartet Sound: 1 -Box 9: +Scene 9: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Wo?!? Sound: 5 -Box 10: +Scene 10: Location: 2 Color: 0.4 0.2 0.2 Name: April Text: Dort drŸben! Sound: 6 -Box 11: +Scene 11: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/clover.txt b/Data/Dialogues/clover.txt index ed12169..8efcacf 100644 --- a/Data/Dialogues/clover.txt +++ b/Data/Dialogues/clover.txt @@ -1,41 +1,41 @@ -Dialogue boxes: 6 +Dialogue scenes: 6 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, Clover! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.2 0.0 Name: Clover Text: Wha, time to wake up already? Sound: 4 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Why are you so sleepy? Sound: 6 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.2 0.0 Name: Clover Text: I had a horrible dream last night... Sound: 4 -Box 5: +Scene 5: Location: 2 Color: 0.0 0.2 0.0 Name: Clover Text: I don't want to talk about it. Sound: 5 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/clover2.txt b/Data/Dialogues/clover2.txt index 0e203a7..12c8e62 100644 --- a/Data/Dialogues/clover2.txt +++ b/Data/Dialogues/clover2.txt @@ -1,55 +1,55 @@ -Dialogue boxes: 8 +Dialogue scenes: 8 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, you're awake! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.2 0.0 Name: Clover Text: I am! What happened over there? Sound: 7 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: A stranger attacked me; I don't know why. Sound: 1 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.2 0.0 Name: Clover Text: Oh god, that's how it began... Sound: 4 -Box 5: +Scene 5: Location: 2 Color: 0.0 0.2 0.0 Name: Clover Text: We have to leave. Sound: 6 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Huh? Sound: 5 -Box 7: +Scene 7: Location: 2 Color: 0.0 0.2 0.0 Name: Clover Text: No, it couldn't have been real. Never mind. Sound: 1 -Box 8: +Scene 8: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/guard.txt b/Data/Dialogues/guard.txt index b7344c5..0b1156b 100644 --- a/Data/Dialogues/guard.txt +++ b/Data/Dialogues/guard.txt @@ -1,19 +1,19 @@ -Dialogue boxes: 4 +Dialogue scenes: 4 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hello again. Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.1 0.1 Name: Hunter## Text: I don't care if my friend thinks you're a hero; I\need the cash to feed my family. Sound: 1 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 @@ -21,7 +21,7 @@ Name: Turner Text: Please don't do this. You can't feed your family\if you're dead. Sound: 6 -Box 4: +Scene 4: Location: 2 Color: 0.2 0.1 0.1 Name: Hunter## diff --git a/Data/Dialogues/guards.txt b/Data/Dialogues/guards.txt index b509bc2..87bed7c 100644 --- a/Data/Dialogues/guards.txt +++ b/Data/Dialogues/guards.txt @@ -1,62 +1,62 @@ -Dialogue boxes: 8 +Dialogue scenes: 8 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Have you seen Jack around here lately? Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: Jack? I know lots of Jacks. Sound: 1 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Solid brown, a few inches shorter than me... Sound: 6 -Box 4: +Scene 4: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: Oh, yeah that guy wanted us to kill someone\named Turner. Sound: 1 -Box 4: +Scene 4: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: ... but since we haven't seen Turner.... Sound: 6 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.1 0.1 Name: Hunter## Text: Isn't this him?####### Sound: 4 -Box 6: +Scene 6: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: Not as far as I'm concerned.####### Sound: 3 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Thanks, I guess. I'll see you around. Sound: 1 -Box 8: +Scene 8: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### diff --git a/Data/Dialogues/jack.txt b/Data/Dialogues/jack.txt index 85e6c7a..9440ed8 100644 --- a/Data/Dialogues/jack.txt +++ b/Data/Dialogues/jack.txt @@ -1,48 +1,48 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, Jack######! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: Hi, Turner! Could you do me a huge favor? Sound: 2 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Sure, what is it? Sound: 3 -Box 4: +Scene 4: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: I went to the Rocky Hall a few days ago and hired two\guards to help protect our village. Sound: 2 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: But they haven't come yet! Sound: 4 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Lazy bastards. I'll check up on them next time I go\over there. Sound: 2 -Box 7: +Scene 7: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### diff --git a/Data/Dialogues/jack2.txt b/Data/Dialogues/jack2.txt index fc30f23..8a64cad 100644 --- a/Data/Dialogues/jack2.txt +++ b/Data/Dialogues/jack2.txt @@ -1,55 +1,55 @@ -Dialogue boxes: 8 +Dialogue scenes: 8 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, Jack######! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: Hey, what's up? Sound: 6 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I think I may have just found a raider scout. Sound: 1 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I'm going to look for more. Will you come with me? Sound: 6 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: I would, but I hurt my feet yesterday when I fell off\the lookout ruins. Sound: 1 -Box 6: +Scene 6: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: I'm not as agile as I used to be. Sound: 4 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Ah, okay. Please look after my family! Sound: 1 -Box 8: +Scene 8: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### diff --git a/Data/Dialogues/jack3.txt b/Data/Dialogues/jack3.txt index 7e75fc5..eafe35e 100644 --- a/Data/Dialogues/jack3.txt +++ b/Data/Dialogues/jack3.txt @@ -1,62 +1,62 @@ -Dialogue boxes: 9 +Dialogue scenes: 9 -Box 1: +Scene 1: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: Turner...############## Sound: 6 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: You're alive!######### Sound: 5 -Box 3: +Scene 3: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: Not for long, I fear. Sound: 4 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Where is Skipper? Sound: 7 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: He just watched as the raiders attacked. Sound: 4 -Box 6: +Scene 6: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: He went with them to the desert. Sound: 6 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I swear, I will kill all of them. Sound: 4 -Box 8: +Scene 8: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: You must avenge us! And then go to the Rocky Hall\and warn the others! Sound: 1 -Box 9: +Scene 9: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/jack4.txt b/Data/Dialogues/jack4.txt index 5a742be..bcf7d8a 100644 --- a/Data/Dialogues/jack4.txt +++ b/Data/Dialogues/jack4.txt @@ -1,83 +1,83 @@ -Dialogue boxes: 12 +Dialogue scenes: 12 -Box 1: +Scene 1: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: Hi Turner! What an expected surprise! Sound: 7 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Keep talking, it will make me feel better about\killing you. Sound: 1 -Box 3: +Scene 3: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: What? I'm your friend! Why would you hurt me? Sound: 4 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: The raiders didn't kill Skipper like you wanted; he\told me all about you. Why did you do it? Sound: 1 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: Raiders... so unreliable. Good thing you killed them\all. Sound: 7 -Box 6: +Scene 6: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: The wolves killed all the prey near where they live,\and have to expand their territory. Sound: 6 -Box 7: +Scene 7: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: They don't want to repeat their mistake and kill\everyone on this island, so they will just make\us slaves. Sound: 1 -Box 8: +Scene 8: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: Their only obstacle was the raiders, who bow to\no one. Fortunately I tricked you into solving that\little problem. Sound: 6 -Box 9: +Scene 9: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Why would you help them enslave us? Sound: 4 -Box 10: +Scene 10: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### Text: They promised the king that they would not\hurt him, so he ordered me to help them. I must do\my duty. Sound: 1 -Box 11: +Scene 11: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: The king is in on this? Will I have to kill EVERYBODY\to make this right? Sound: 4 -Box 12: +Scene 12: Location: 2 Color: 0.2 0.0 0.0 Name: Jack### diff --git a/Data/Dialogues/jackguards.txt b/Data/Dialogues/jackguards.txt index badc288..e35c73a 100644 --- a/Data/Dialogues/jackguards.txt +++ b/Data/Dialogues/jackguards.txt @@ -1,13 +1,13 @@ -Dialogue boxes: 2 +Dialogue scenes: 2 -Box 1: +Scene 1: Location: 1 Color: 0.2 0.0 0.0 Name: Jet Text: Stay sharp, I can feel him coming. My fur is\standing on end. Sound: 4 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.2 0.0 Name: Alan diff --git a/Data/Dialogues/king.txt b/Data/Dialogues/king.txt index 5632d6f..724538b 100644 --- a/Data/Dialogues/king.txt +++ b/Data/Dialogues/king.txt @@ -1,55 +1,55 @@ -Dialogue boxes: 9 +Dialogue scenes: 9 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner## Text: Move aside! I must speak with the king! Sound: 4 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.2 0.0 Name: Axle###### Text: I'm not sure I can let you do that. Sound: 6 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner#### Text: He is betraying you all to save himself! Sound: 4 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner#### Text: He is letting the wolves enslave our villages because\he is too cowardly to fight! Sound: 1 -Box 5: +Scene 5: Location: 2 Color: 0.0 0.0 0.0 Name: Hickory# Text: What? Guards, kill him!####### Sound: 4 -Box 6: +Scene 6: Location: 2 Color: 0.0 0.2 0.0 Name: Axle#### Text: ... Sound: 0 -Box 7: +Scene 7: Location: 2 Color: 0.2 0.0 0.0 Name: Guards## Text: ... Sound: 0 -Box 8: +Scene 8: Location: 1 Color: 0.0 0.0 0.0 Name: Turner @@ -57,7 +57,7 @@ Text: You no longer have any power here. Sound: 7 -Box 9: +Scene 9: Location: 2 Color: 0.0 0.0 0.0 Name: Hickory# diff --git a/Data/Dialogues/king2.txt b/Data/Dialogues/king2.txt index a315b09..980c4a2 100644 --- a/Data/Dialogues/king2.txt +++ b/Data/Dialogues/king2.txt @@ -1,62 +1,62 @@ -Dialogue boxes: 9 +Dialogue scenes: 9 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner## Text: So this is where you ran off to. Sound: 3 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.0 0.0 Name: Hickory#### Text: Don't even think about trying anything. I sent three\wolves after you, and they will be here soon.####### Sound: 1 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner## Text: I am not afraid of wolves; especially ones that I've\just killed. Sound: 7 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.0 0.0 Name: Hickory#### Text: What? Impossible. Wolves have evolved to be natural\ killing machines, and you to be their prey.####### Sound: 4 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner## Text: They may have sharper claws and stronger muscles\but their tactics are weak. Nobody has ever challenged\them before. Sound: 2 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner## Text: I fight back because I can, and even if I could not,\I would rather die than surrender. Sound: 5 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner## Text: I can kill them with my bare hands. Why are you so\afraid of them? You even have a sword. Sound: 6 -Box 8: +Scene 8: Location: 2 Color: 0.0 0.0 0.0 Name: Hickory#### Text: You think I'm afraid? I am not helping the wolves out\of fear. It is all part of my master plan. Sound: 4 -Box 9: +Scene 9: Location: 2 Color: 0.0 0.0 0.0 Name: Hickory#### diff --git a/Data/Dialogues/protest.txt b/Data/Dialogues/protest.txt index 7bcf253..ffcff5e 100644 --- a/Data/Dialogues/protest.txt +++ b/Data/Dialogues/protest.txt @@ -1,34 +1,34 @@ -Dialogue boxes: 5 +Dialogue scenes: 5 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Why are opposing my rule? Don't you realise that\the penalty for treason is death? Sound: 1 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.2 0.0 Name: Nat Text: That is what we are protesting! You kill anyone\who disagrees with you! Sound: 4 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I only kill those who disobey me. I have no law\against dissent, but I can't allow you to undermine\my authority. Sound: 2 -Box 4: +Scene 4: Location: 2 Color: 0.2 0.2 0.0 Name: Nat Text: If you want to stop us, you will have to kill us\all! Sound: 6 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/raidercamp.txt b/Data/Dialogues/raidercamp.txt index 6463373..3286915 100644 --- a/Data/Dialogues/raidercamp.txt +++ b/Data/Dialogues/raidercamp.txt @@ -1,13 +1,13 @@ -Dialogue boxes: 2 +Dialogue scenes: 2 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: This camp looks vulnerable. Sound: 1 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/raiderchief.txt b/Data/Dialogues/raiderchief.txt index 9ee454d..959dd0b 100644 --- a/Data/Dialogues/raiderchief.txt +++ b/Data/Dialogues/raiderchief.txt @@ -1,83 +1,83 @@ -Dialogue boxes: 12 +Dialogue scenes: 12 -Box 1: +Scene 1: Location: 2 Color: 0.2 0.0 0.0 Name: Aspen Text: Bring the guards before me. Why aren't they at\their posts?! Sound: 1 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.0 0.0 Name: Aspen Text: Whoa. Sound: 3 -Box 3: +Scene 3: Location: 2 Color: 0.2 0.0 0.0 Name: Aspen Text: I go away for a couple minutes and this is what\happens. Sound: 1 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: You ordered the raid on my village? Sound: 6 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.0 0.0 Name: Aspen Text: Well, it's a bit more complicated than that. Sound: 1 -Box 6: +Scene 6: Location: 2 Color: 0.2 0.0 0.0 Name: Aspen Text: But yeah, basically. Sound: 8 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Aspen Text: You killed my family! And my friends! Sound: 6 -Box 8: +Scene 8: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: You even stole my armor! Sound: 4 -Box 9: +Scene 9: Location: 2 Color: 0.2 0.0 0.0 Name: Aspen Text: It looks better on me than it would on you. Sound: 6 -Box 10: +Scene 10: Location: 2 Color: 0.2 0.0 0.0 Name: Aspen Text: I suppose you want to fight me, then. Sound: 8 -Box 11: +Scene 11: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Wait, where is Skipper? Sound: 6 -Box 12: +Scene 12: Location: 2 Color: 0.2 0.0 0.0 Name: Aspen diff --git a/Data/Dialogues/raiderguard.txt b/Data/Dialogues/raiderguard.txt index 52da150..4fe7f4b 100644 --- a/Data/Dialogues/raiderguard.txt +++ b/Data/Dialogues/raiderguard.txt @@ -1,13 +1,13 @@ -Dialogue boxes: 2 +Dialogue scenes: 2 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Why aren't you attacking me? Sound: 6 -Box 2: +Scene 2: Location: 2 Color: 0.1 0.2 0.0 Name: Ray diff --git a/Data/Dialogues/raiders.txt b/Data/Dialogues/raiders.txt index 78f3aa5..134e34e 100644 --- a/Data/Dialogues/raiders.txt +++ b/Data/Dialogues/raiders.txt @@ -1,27 +1,27 @@ -Dialogue boxes: 4 +Dialogue scenes: 4 -Box 1: +Scene 1: Location: 1 Color: 0.2 0.0 0.0 Name: Hawk Text: Didn't Skipper say there was some crazy fighter\bunny in his village? Sound: 1 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.0 0.0 Name: Cypress Text: Yeah, but Skipper set a trap for him; he must be\dead by now. Sound: 6 -Box 3: +Scene 3: Location: 1 Color: 0.2 0.0 0.0 Name: Hawk Text: I certainly hope so. I don't think he'd appreciate\what you did with his wife. Sound: 1 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.0 0.0 Name: Cypress diff --git a/Data/Dialogues/raiderscout.txt b/Data/Dialogues/raiderscout.txt index 528c899..58a016e 100644 --- a/Data/Dialogues/raiderscout.txt +++ b/Data/Dialogues/raiderscout.txt @@ -1,6 +1,6 @@ -Dialogue boxes: 1 +Dialogue scenes: 1 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner############## diff --git a/Data/Dialogues/raiderscout2.txt b/Data/Dialogues/raiderscout2.txt index 51d913a..2689048 100644 --- a/Data/Dialogues/raiderscout2.txt +++ b/Data/Dialogues/raiderscout2.txt @@ -1,41 +1,41 @@ -Dialogue boxes: 6 +Dialogue scenes: 6 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What do you think you're doing here? Sound: 1 -Box 2: +Scene 2: Location: 2 Color: 0.1 0.2 0.0 Name: Wanderer Text: Hey now, is this how you greet all visitors? Sound: 4 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: No, but I met one a few minutes ago who attacked me\without warning! Sound: 1 -Box 4: +Scene 4: Location: 2 Color: 0.1 0.2 0.0 Name: Wanderer Text: What? The raiders are coming here too? Sound: 4 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: So that WAS a raider scout! Sound: 6 -Box 6: +Scene 6: Location: 2 Color: 0.1 0.2 0.0 Name: Wanderer diff --git a/Data/Dialogues/skipper.txt b/Data/Dialogues/skipper.txt index 9eefdcb..b130afc 100644 --- a/Data/Dialogues/skipper.txt +++ b/Data/Dialogues/skipper.txt @@ -1,48 +1,48 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hi, Skipper! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: Hey, Turner! Sound: 7 -Box 3: +Scene 3: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: What's all this talk about hiring guards? Sound: 1 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: There's never been any trouble here while I've been in\charge! Sound: 4 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: The raiders are getting more confident... you never\know. Sound: 1 -Box 6: +Scene 6: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: I've seen you when you get mad; I think you could\take care of yourself. Sound: 6 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/skipper2.txt b/Data/Dialogues/skipper2.txt index 31dc060..79650c9 100644 --- a/Data/Dialogues/skipper2.txt +++ b/Data/Dialogues/skipper2.txt @@ -1,55 +1,55 @@ -Dialogue boxes: 8 +Dialogue scenes: 8 -Box 1: +Scene 1: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: It's too soon! Sound: 4 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What? Sound: 6 -Box 3: +Scene 3: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: Oh, hi, Turner! Sound: 5 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: Maybe you should go check if there are any other\raider scouts. Sound: 1 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: That's my plan; aren't you coming? Sound: 7 -Box 6: +Scene 6: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: Me? Oh, uh, no. I have to... defend this area. Sound: 1 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Ah, true. Take care of my family! Sound: 4 -Box 8: +Scene 8: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper diff --git a/Data/Dialogues/skipper3.txt b/Data/Dialogues/skipper3.txt index bf4e51b..8f26c5d 100644 --- a/Data/Dialogues/skipper3.txt +++ b/Data/Dialogues/skipper3.txt @@ -1,62 +1,62 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: Turner! I'm so glad you're alive! Sound: 6 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: ... What? Sound: 3 -Box 3: +Scene 3: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: Jack set up the raid, not me! He told me about it,\but swore that nobody would be hurt! Sound: 1 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: He wanted the raiders to kill me so I couldn't talk\but they kept me alive for ransom. Sound: 1 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: But I saw Jack die! Sound: 4 -Box 6: +Scene 6: Location: 2 Color: 0.0 0.0 0.2 Name: Skipper Text: Huh? No, that's impossible. He must have been\faking it. Sound: 1 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I'll go check if his body is there. Sound: 6 -Box 8: +Scene 8: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: But you promised to protect my family, and this\stupid guard is still a raider. Sound: 7 -Box 9: +Scene 9: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/trixie.txt b/Data/Dialogues/trixie.txt index aaa33e1..72b165f 100644 --- a/Data/Dialogues/trixie.txt +++ b/Data/Dialogues/trixie.txt @@ -1,34 +1,34 @@ -Dialogue boxes: 5 +Dialogue scenes: 5 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hi, Sarah!#### Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.1 0.1 Name: Sarah##### Text: Hi, honeybunny! Sound: 7 -Box 3: +Scene 3: Location: 2 Color: 0.2 0.1 0.1 Name: Sarah### Text: Our daughter is up on the lookout ruins and refuses\to come down. Sound: 1 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Again?! Sound: 4 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/trixie2.txt b/Data/Dialogues/trixie2.txt index 1af1c26..50658ec 100644 --- a/Data/Dialogues/trixie2.txt +++ b/Data/Dialogues/trixie2.txt @@ -1,48 +1,48 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hey, Sarah! Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.1 0.1 Name: Sarah Text: Are you alright? Sound: 4 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Yes, I'm not sure about the other guy though. Sound: 1 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I'm going to go check for more. Sound: 7 -Box 5: +Scene 5: Location: 2 Color: 0.2 0.1 0.1 Name: Sarah Text: I'll come with you. Sound: 8 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Thanks! I would prefer if you stay here with\April though. Sound: 1 -Box 7: +Scene 7: Location: 2 Color: 0.2 0.1 0.1 Name: Sarah diff --git a/Data/Dialogues/turner.txt b/Data/Dialogues/turner.txt index ec21e18..233d4fd 100644 --- a/Data/Dialogues/turner.txt +++ b/Data/Dialogues/turner.txt @@ -1,34 +1,34 @@ -Dialogue boxes: 5 +Dialogue scenes: 5 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What... Sound: 4 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: No. Sound: 4 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: ... Sound: 0 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: ... Sound: 0 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/turner10.txt b/Data/Dialogues/turner10.txt index 182610f..5e832a3 100644 --- a/Data/Dialogues/turner10.txt +++ b/Data/Dialogues/turner10.txt @@ -1,34 +1,34 @@ -Dialogue Boxes: 5 +Dialogue Scenees: 5 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: You're right, I don't want to be a king. Sound: 6 -Box 2: +Scene 2: Location: 2 Color: 0.1 0.1 0.2 Name: Fiv#er## Text: Wh##at?############ Sound: 4 -Box 3: +Scene 3: Location: 2 Color: 0.2 0.0 0.0 Name: Ba##sil# Text: Goo###d call.########### Sound: 3 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I don't belong here.#### Sound: 7 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/turner2.txt b/Data/Dialogues/turner2.txt index 69ec280..026d23b 100644 --- a/Data/Dialogues/turner2.txt +++ b/Data/Dialogues/turner2.txt @@ -1,13 +1,13 @@ -Dialogue boxes: 2 +Dialogue scenes: 2 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: This raider looks like he has wandered astray. Sound: 1 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/turner3.txt b/Data/Dialogues/turner3.txt index f2f216f..a8e67b7 100644 --- a/Data/Dialogues/turner3.txt +++ b/Data/Dialogues/turner3.txt @@ -1,13 +1,13 @@ -Dialogue boxes: 2 +Dialogue scenes: 2 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What... he's gone. Sound: 4 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/turner4.txt b/Data/Dialogues/turner4.txt index aa4e656..4a2edb8 100644 --- a/Data/Dialogues/turner4.txt +++ b/Data/Dialogues/turner4.txt @@ -1,13 +1,13 @@ -Dialogue boxes: 2 +Dialogue scenes: 2 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What is a wolf doing here?! Sound: 4 -Box 2: +Scene 2: Location: 2 Color: 0.1 0.0 0.0 Name: Smoke diff --git a/Data/Dialogues/turner5.txt b/Data/Dialogues/turner5.txt index e1a338a..79a4186 100644 --- a/Data/Dialogues/turner5.txt +++ b/Data/Dialogues/turner5.txt @@ -1,6 +1,6 @@ -Dialogue boxes: 1 +Dialogue scenes: 1 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/turner6.txt b/Data/Dialogues/turner6.txt index f701374..8ea7684 100644 --- a/Data/Dialogues/turner6.txt +++ b/Data/Dialogues/turner6.txt @@ -1,48 +1,48 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 2 Color: 0.0 0.0 0.0 Name: Hickory# Text: He can have his fun pretending to be king, for now.\ We will see who comes out on top. Sound: 1 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I am going to go talk with the Alpha Wolf,\and kill him if he does not back down. Sound: 1 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: You have to stay and defend this hall. Sound: 7 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: What is your name? Sound: 3 -Box 5: +Scene 5: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver Text: Fiver! Sound: 6 -Box 6: +Scene 6: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: You are in charge until I return. Sound: 7 -Box 7: +Scene 7: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver diff --git a/Data/Dialogues/turner7.txt b/Data/Dialogues/turner7.txt index c317b2a..9492fa8 100644 --- a/Data/Dialogues/turner7.txt +++ b/Data/Dialogues/turner7.txt @@ -1,13 +1,13 @@ -Dialogue boxes: 2 +Dialogue scenes: 2 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: There may be mothers and children in this den... Sound: 1 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner diff --git a/Data/Dialogues/turner8.txt b/Data/Dialogues/turner8.txt index 9010bcc..d8f8163 100644 --- a/Data/Dialogues/turner8.txt +++ b/Data/Dialogues/turner8.txt @@ -1,90 +1,90 @@ -Dialogue boxes: 13 +Dialogue scenes: 13 -Box 1: +Scene 1: Location: 2 Color: 0.0 0.2 0.0 Name: Axle#### Text: You know, Turner has no chance at all against the\Alpha Wolf. Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.0 0.0 Name: Basil#### Text: Now that he is dead, we might as well re-organize\ourselves. Sound: 1 -Box 3: +Scene 3: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: He's not dead... I've never seen anyone fight as\well as he does. Sound: 4 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.2 0.0 Name: Axle#### Text: Even so, he is a rabbit, and he's trying to fight\the strongest wolf there is. Sound: 6 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner### Text: Hey, I'm back. Sound: 3 -Box 6: +Scene 6: Location: 2 Color: 0.0 0.2 0.0 Name: Axle#### Text: You were too scared to fight the Alpha Wolf,\it seems. Sound: 1 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner#### Text: No, I slew him. And his family. Sound: 7 -Box 8: +Scene 8: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: Wow. Sound: 3 -Box 9: +Scene 9: Location: 2 Color: 0.0 0.2 0.0 Name: Axle#### Text: Hmm... Impressive. Sound: 6 -Box 10: +Scene 10: Location: 2 Color: 0.2 0.0 0.0 Name: Basil### Text: Thanks for your help, but you would never\fit in here. Sound: 1 -Box 11: +Scene 11: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: No! You should claim the throne; nobody can\challenge your power. Sound: 4 -Box 12: +Scene 12: Location: 2 Color: 0.2 0.0 0.0 Name: Basil#### Text: What? He knows nothing about governing. Sound: 3 -Box 13: +Scene 13: Location: 2 Color: 0.2 0.0 0.0 Name: Basil### diff --git a/Data/Dialogues/turner81.txt b/Data/Dialogues/turner81.txt index cad18da..05cbc37 100644 --- a/Data/Dialogues/turner81.txt +++ b/Data/Dialogues/turner81.txt @@ -1,62 +1,62 @@ -Dialogue boxes: 9 +Dialogue scenes: 9 -Box 1: +Scene 1: Location: 2 Color: 0.0 0.2 0.0 Name: A##xle# Text: You know, Turner has no chance at all against the\Alpha Wolf. Sound: 7 -Box 2: +Scene 2: Location: 2 Color: 0.2 0.0 0.0 Name: B##asil# Text: Now that he is dead, we might as well re-organize\ourselves. Sound: 1 -Box 3: +Scene 3: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: He's not dead... I've never seen anyone fight as\well as he does. Sound: 4 -Box 4: +Scene 4: Location: 2 Color: 0.0 0.2 0.0 Name: A##xle# Text: Even so, he is a rabbit, and he's trying to fight\the strongest wolf there is. Sound: 6 -Box 5: +Scene 5: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Hello... I'm back. Sound: 4 -Box 6: +Scene 6: Location: 2 Color: 0.0 0.2 0.0 Name: A##xle# Text: You were too scared to fight the Alpha Wolf,\it seems. Sound: 1 -Box 7: +Scene 7: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: No, I slew him. And his family. Sound: 7 -Box 8: +Scene 8: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: Wow.####### Sound: 3 -Box 9: +Scene 9: Location: 2 Color: 0.0 0.2 0.0 Name: A##xle# diff --git a/Data/Dialogues/turner82.txt b/Data/Dialogues/turner82.txt index 2824af0..89d5670 100644 --- a/Data/Dialogues/turner82.txt +++ b/Data/Dialogues/turner82.txt @@ -1,27 +1,27 @@ -Dialogue boxes: 4 +Dialogue scenes: 4 -Box 1: +Scene 1: Location: 2 Color: 0.2 0.0 0.0 Name: Ba##sil# Text: Thanks for your help, but you would never\fit in here. Sound: 1 -Box 2: +Scene 2: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver### Text: No! You should claim the throne; nobody can\challenge your power. Sound: 4 -Box 3: +Scene 3: Location: 2 Color: 0.2 0.0 0.0 Name: Ba##sil# Text: What? He knows nothing about governing. Sound: 3 -Box 4: +Scene 4: Location: 2 Color: 0.2 0.0 0.0 Name: Ba##sil# diff --git a/Data/Dialogues/turner9.txt b/Data/Dialogues/turner9.txt index c3fa696..23cb23a 100644 --- a/Data/Dialogues/turner9.txt +++ b/Data/Dialogues/turner9.txt @@ -1,48 +1,48 @@ -Dialogue boxes: 7 +Dialogue scenes: 7 -Box 1: +Scene 1: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: I am going to stay here, and rule over this island. Sound: 1 -Box 2: +Scene 2: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: If any of you want to challenge my authority, be\my guest. Sound: 2 -Box 3: +Scene 3: Location: 2 Color: 0.0 0.2 0.0 Name: Guards Text: ... Sound: 0 -Box 4: +Scene 4: Location: 1 Color: 0.0 0.0 0.0 Name: Turner Text: Outlaws will no longer be tolerated in my domain.\If anyone disobeys my laws, I will hunt them down and\kill them myself. Sound: 1 -Box 5: +Scene 5: Location: 2 Color: 0.3 0.3 0.3 Name: Text: ... 2 weeks later Sound: 0 -Box 6: +Scene 6: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver Text: King Turner! One of your villages is staging a\protest against your rule! Sound: 4 -Box 7: +Scene 7: Location: 2 Color: 0.1 0.1 0.2 Name: Fiver diff --git a/Data/Dialogues/wolfpatrol.txt b/Data/Dialogues/wolfpatrol.txt index 9cff67e..d098321 100644 --- a/Data/Dialogues/wolfpatrol.txt +++ b/Data/Dialogues/wolfpatrol.txt @@ -1,20 +1,20 @@ -Dialogue boxes: 2 +Dialogue scenes: 2 -Box 1: +Scene 1: Location: 1 Color: 0.2 0.0 0.0 Name: Shadow Text: That ex-king better not be wrong; I can't\wait to put this silly rabbit in his place. Sound: 9 -Box 2: +Scene 2: Location: 2 Color: 0.0 0.2 0.0 Name: Snow Text: I smell it nearby; Quick, we must split up and\find it! Sound: 13 -Box 3: +Scene 3: Location: 1 Color: 0.0 0.0 0.0 Name: Wolf diff --git a/Source/ConsoleCmds.cpp b/Source/ConsoleCmds.cpp index 46b5938..a4cbfb5 100644 --- a/Source/ConsoleCmds.cpp +++ b/Source/ConsoleCmds.cpp @@ -601,7 +601,7 @@ void ch_fixtype(const char *args) void ch_fixrotation(const char *args) { - int playerId = Dialog::currentBox().participantfocus; + int playerId = Dialog::currentScene().participantfocus; Dialog::currentDialog().participantyaw[playerId] = Person::players[playerId]->yaw; } diff --git a/Source/Dialog.cpp b/Source/Dialog.cpp index 1f7698d..5987c8f 100644 --- a/Source/Dialog.cpp +++ b/Source/Dialog.cpp @@ -43,15 +43,15 @@ void Dialog::loadDialogs(FILE* tfile) Dialog::Dialog(FILE* tfile) : gonethrough(0) { - int numdialogboxes; - funpackf(tfile, "Bi", &numdialogboxes); + int numdialogscenes; + funpackf(tfile, "Bi", &numdialogscenes); funpackf(tfile, "Bi", &type); for (int l = 0; l < 10; l++) { funpackf(tfile, "Bf Bf Bf", &participantlocation[l].x, &participantlocation[l].y, &participantlocation[l].z); funpackf(tfile, "Bf", &participantyaw[l]); } - for (int l = 0; l < numdialogboxes; l++) { - boxes.push_back(DialogBox(tfile)); + for (int l = 0; l < numdialogscenes; l++) { + scenes.push_back(DialogScene(tfile)); } } @@ -85,7 +85,7 @@ void fpackf_string(FILE* tfile, std::string text) } } -DialogBox::DialogBox(FILE* tfile) +DialogScene::DialogScene(FILE* tfile) { funpackf(tfile, "Bi", &location); funpackf(tfile, "Bf", &color[0]); @@ -111,18 +111,18 @@ Dialog::Dialog(int type, std::string filename) : type(type) { ifstream ipstream(ConvertFileName(filename.c_str())); ipstream.ignore(256, ':'); - int numboxes; - ipstream >> numboxes; - for (int i = 0; i < numboxes; i++) { - boxes.push_back(DialogBox(ipstream)); + int numscenes; + ipstream >> numscenes; + for (int i = 0; i < numscenes; i++) { + scenes.push_back(DialogScene(ipstream)); for (unsigned j = 0; j < Person::players.size(); j++) { - boxes.back().participantfacing[j] = Person::players[j]->facing; + scenes.back().participantfacing[j] = Person::players[j]->facing; } } ipstream.close(); } -DialogBox::DialogBox(ifstream &ipstream) +DialogScene::DialogScene(ifstream &ipstream) { ipstream.ignore(256, ':'); ipstream.ignore(256, ':'); @@ -168,8 +168,8 @@ void Dialog::tick(int id) void Dialog::play() { - for (int i = 0; i < boxes.size(); i++) { - int playerId = boxes[i].participantfocus; + for (int i = 0; i < scenes.size(); i++) { + int playerId = scenes[i].participantfocus; Person::players[playerId]->coords = participantlocation[playerId]; Person::players[playerId]->yaw = participantyaw[playerId]; Person::players[playerId]->targetyaw = participantyaw[playerId]; @@ -181,8 +181,8 @@ void Dialog::play() Dialog::directing = false; Dialog::indialogue = 0; - if (boxes[indialogue].sound != 0) { - Game::playdialogueboxsound(); + if (scenes[indialogue].sound != 0) { + Game::playdialoguescenesound(); } } @@ -197,18 +197,18 @@ void Dialog::saveDialogs(FILE* tfile) void Dialog::save(FILE* tfile) { - fpackf(tfile, "Bi", boxes.size()); + fpackf(tfile, "Bi", scenes.size()); fpackf(tfile, "Bi", type); for (int l = 0; l < 10; l++) { fpackf(tfile, "Bf Bf Bf", participantlocation[l].x, participantlocation[l].y, participantlocation[l].z); fpackf(tfile, "Bf", participantyaw[l]); } - for (int l = 0; l < boxes.size(); l++) { - boxes[l].save(tfile); + for (int l = 0; l < scenes.size(); l++) { + scenes[l].save(tfile); } } -void DialogBox::save(FILE* tfile) +void DialogScene::save(FILE* tfile) { fpackf(tfile, "Bi", location); fpackf(tfile, "Bf", color[0]); diff --git a/Source/Dialog.h b/Source/Dialog.h index 96186d3..59c791e 100644 --- a/Source/Dialog.h +++ b/Source/Dialog.h @@ -25,11 +25,11 @@ along with Lugaru. If not, see . #include "Quaternions.h" #include -class DialogBox +class DialogScene { public: - DialogBox(FILE* tfile); - DialogBox(ifstream &ipstream); + DialogScene(FILE* tfile); + DialogScene(ifstream &ipstream); void save(FILE* tfile); int location; @@ -56,7 +56,7 @@ public: int type; int gonethrough; - std::vector boxes; + std::vector scenes; XYZ participantlocation[10]; float participantyaw[10]; @@ -65,7 +65,7 @@ public: static bool inDialog() { return (indialogue != -1); } static Dialog& currentDialog() { return dialogs[whichdialogue]; } - static DialogBox& currentBox() { return currentDialog().boxes[indialogue]; } + static DialogScene& currentScene() { return currentDialog().scenes[indialogue]; } static int indialogue; static int whichdialogue; diff --git a/Source/Game.h b/Source/Game.h index 7369204..7ccc49f 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -148,7 +148,7 @@ void LoadScreenTexture(); void LoadingScreen(); int DrawGLScene(StereoSide side); void LoadMenu(); -void playdialogueboxsound(); +void playdialoguescenesound(); int findClosestPlayer(); void Loadlevel(int which); void Loadlevel(const char *name); diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index a37611b..d8cf5bc 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -960,13 +960,13 @@ int Game::DrawGLScene(StereoSide side) glMatrixMode(GL_MODELVIEW); glPushMatrix(); glLoadIdentity(); - if (Dialog::currentBox().location == 1) + if (Dialog::currentScene().location == 1) glTranslatef(0, screenheight * 3 / 4, 0); glScalef(screenwidth, screenheight / 4, 1); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_BLEND); - glColor4f(Dialog::currentBox().color[0], Dialog::currentBox().color[1], Dialog::currentBox().color[2], 0.7); + glColor4f(Dialog::currentScene().color[0], Dialog::currentScene().color[1], Dialog::currentScene().color[2], 0.7); glBegin(GL_QUADS); glVertex3f(0, 0, 0.0f); glVertex3f(1, 0, 0.0f); @@ -989,9 +989,9 @@ int Game::DrawGLScene(StereoSide side) float starty; startx = screenwidth * 1 / 5; - if (Dialog::currentBox().location == 1) + if (Dialog::currentScene().location == 1) starty = screenheight / 16 + screenheight * 4 / 5; - if (Dialog::currentBox().location == 2) + if (Dialog::currentScene().location == 2) starty = screenheight * 1 / 5 - screenheight / 16; char tempname[264]; @@ -1000,8 +1000,8 @@ int Game::DrawGLScene(StereoSide side) tempname[i] = '\0'; } - for (int i = 0; i < Dialog::currentBox().name.size(); i++) { - tempname[tempnum] = Dialog::currentBox().name[i]; + for (int i = 0; i < Dialog::currentScene().name.size(); i++) { + tempname[tempnum] = Dialog::currentScene().name[i]; if (tempname[tempnum] == '#' || tempname[tempnum] == '\0') tempname[tempnum] = '\0'; else @@ -1010,7 +1010,7 @@ int Game::DrawGLScene(StereoSide side) sprintf (string, "%s: ", tempname); - if (Dialog::currentBox().color[0] + Dialog::currentBox().color[1] + Dialog::currentBox().color[2] < 1.5) { + if (Dialog::currentScene().color[0] + Dialog::currentScene().color[1] + Dialog::currentScene().color[2] < 1.5) { glColor4f(0, 0, 0, tutorialopac); text->glPrintOutline(startx - 2 * 7.6 * strlen(string)*screenwidth / 1024 - 4, starty - 4, string, 1, 1.5 * 1.25 * screenwidth / 1024, screenwidth, screenheight); glColor4f(0.7, 0.7, 0.7, tutorialopac); @@ -1021,9 +1021,9 @@ int Game::DrawGLScene(StereoSide side) } tempnum = 0; - for (int i = 0; i < Dialog::currentBox().text.size() + 1; i++) { - tempname[tempnum] = Dialog::currentBox().text[i]; - if (Dialog::currentBox().text[i] != '#') + for (int i = 0; i < Dialog::currentScene().text.size() + 1; i++) { + tempname[tempnum] = Dialog::currentScene().text[i]; + if (Dialog::currentScene().text[i] != '#') tempnum++; } @@ -1035,7 +1035,7 @@ int Game::DrawGLScene(StereoSide side) int i = 0; while (!done) { if (string[i] == '\n' || string[i] > 'z' || string[i] < ' ' || string[i] == '\0') { - if (Dialog::currentBox().color[0] + Dialog::currentBox().color[1] + Dialog::currentBox().color[2] < 1.5) { + if (Dialog::currentScene().color[0] + Dialog::currentScene().color[1] + Dialog::currentScene().color[2] < 1.5) { glColor4f(0, 0, 0, tutorialopac); text->glPrintOutline(startx/*-7.6*(i-lastline)*screenwidth/1024*/ - 4, starty - 4 - 20 * screenwidth / 1024 * line, string, 1, 1.5 * 1.25 * screenwidth / 1024, screenwidth, screenheight, lastline, i); glColor4f(1, 1, 1, tutorialopac); diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index c688a5f..e5c89d9 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -300,16 +300,16 @@ inline float stepTowardf(float from, float to, float by) return from + by; } -void Game::playdialogueboxsound() +void Game::playdialoguescenesound() { XYZ temppos; - temppos = Person::players[Dialog::currentBox().participantfocus]->coords; + temppos = Person::players[Dialog::currentScene().participantfocus]->coords; temppos = temppos - viewer; Normalise(&temppos); temppos += viewer; int sound = -1; - switch (Dialog::currentBox().sound) { + switch (Dialog::currentScene().sound) { case -6: sound = alarmsound; break; @@ -2204,15 +2204,15 @@ void doDebugKeys() if (Input::isKeyPressed(SDL_SCANCODE_M) && Input::isKeyDown(SDL_SCANCODE_LSHIFT)) { if (objects.numobjects < max_objects - 1) { - XYZ boxcoords; - boxcoords.x = Person::players[0]->coords.x; - boxcoords.z = Person::players[0]->coords.z; - boxcoords.y = Person::players[0]->coords.y - 3; + XYZ scenecoords; + scenecoords.x = Person::players[0]->coords.x; + scenecoords.z = Person::players[0]->coords.z; + scenecoords.y = Person::players[0]->coords.y - 3; if (editortype == bushtype) - boxcoords.y = Person::players[0]->coords.y - .5; + scenecoords.y = Person::players[0]->coords.y - .5; if (editortype == firetype) - boxcoords.y = Person::players[0]->coords.y - .5; - //objects.MakeObject(abs(Random()%3),boxcoords,Random()%360); + scenecoords.y = Person::players[0]->coords.y - .5; + //objects.MakeObject(abs(Random()%3),scenecoords,Random()%360); float temprotat, temprotat2; temprotat = editoryaw; temprotat2 = editorpitch; @@ -2221,9 +2221,9 @@ void doDebugKeys() if (temprotat2 < 0) temprotat2 = Random() % 360; - objects.MakeObject(editortype, boxcoords, (int)temprotat - ((int)temprotat) % 30, (int)temprotat2, editorsize); + objects.MakeObject(editortype, scenecoords, (int)temprotat - ((int)temprotat) % 30, (int)temprotat2, editorsize); if (editortype == treetrunktype) - objects.MakeObject(treeleavestype, boxcoords, Random() % 360 * (temprotat2 < 2) + (int)editoryaw - ((int)editoryaw) % 30, editorpitch, editorsize); + objects.MakeObject(treeleavestype, scenecoords, Random() % 360 * (temprotat2 < 2) + (int)editoryaw - ((int)editoryaw) % 30, editorpitch, editorsize); } } @@ -5685,31 +5685,31 @@ void Game::Tick() if (Input::isKeyPressed(SDL_SCANCODE_MINUS)) whichend = -1; if (whichend != -1) { - Dialog::currentBox().participantfocus = whichend; + Dialog::currentScene().participantfocus = whichend; Dialog::currentDialog().participantlocation[whichend] = Person::players[whichend]->coords; Dialog::currentDialog().participantyaw[whichend] = Person::players[whichend]->yaw; } if (whichend == -1) { - Dialog::currentBox().participantfocus = -1; + Dialog::currentScene().participantfocus = -1; } /* FIXME: potentially accessing -1 in Person::players! */ - if (Person::players[Dialog::currentBox().participantfocus]->dead) { + if (Person::players[Dialog::currentScene().participantfocus]->dead) { Dialog::indialogue = -1; Dialog::directing = false; cameramode = 0; } - Dialog::currentBox().camera = viewer; - Dialog::currentBox().camerayaw = yaw; - Dialog::currentBox().camerapitch = pitch; + Dialog::currentScene().camera = viewer; + Dialog::currentScene().camerayaw = yaw; + Dialog::currentScene().camerapitch = pitch; Dialog::indialogue++; - if (Dialog::indialogue < Dialog::currentDialog().boxes.size()) { - if (Dialog::currentBox().sound != 0) { - playdialogueboxsound(); + if (Dialog::indialogue < Dialog::currentDialog().scenes.size()) { + if (Dialog::currentScene().sound != 0) { + playdialoguescenesound(); } } for (unsigned j = 0; j < Person::players.size(); j++) { - Dialog::currentBox().participantfacing[j] = Dialog::currentDialog().boxes[Dialog::indialogue - 1].participantfacing[j]; + Dialog::currentScene().participantfacing[j] = Dialog::currentDialog().scenes[Dialog::indialogue - 1].participantfacing[j]; } } //TODO: should these be KeyDown or KeyPressed? @@ -5734,9 +5734,9 @@ void Game::Tick() if (Input::isKeyDown(SDL_SCANCODE_KP_8)) whichend = 8; if (Input::isKeyDown(SDL_SCANCODE_KP_9)) whichend = 9; if (Input::isKeyDown(SDL_SCANCODE_KP_0)) whichend = 0; - Dialog::currentBox().participantfacing[whichend] = facing; + Dialog::currentScene().participantfacing[whichend] = facing; } - if (Dialog::indialogue >= Dialog::currentDialog().boxes.size()) { + if (Dialog::indialogue >= Dialog::currentDialog().scenes.size()) { Dialog::indialogue = -1; Dialog::directing = false; cameramode = 0; @@ -5744,10 +5744,10 @@ void Game::Tick() } if (!Dialog::directing) { pause_sound(whooshsound); - viewer = Dialog::currentBox().camera; + viewer = Dialog::currentScene().camera; viewer.y = max((double)viewer.y, terrain.getHeight(viewer.x, viewer.z) + .1); - yaw = Dialog::currentBox().camerayaw; - pitch = Dialog::currentBox().camerapitch; + yaw = Dialog::currentScene().camerayaw; + pitch = Dialog::currentScene().camerapitch; if (Dialog::dialoguetime > 0.5) { if ( Input::isKeyPressed(SDL_SCANCODE_1) || Input::isKeyPressed(SDL_SCANCODE_2) || @@ -5762,21 +5762,21 @@ void Game::Tick() Input::isKeyPressed(SDL_SCANCODE_MINUS) || Input::isKeyPressed(attackkey)) { Dialog::indialogue++; - if (Dialog::indialogue < Dialog::currentDialog().boxes.size()) { - if (Dialog::currentBox().sound != 0) { - playdialogueboxsound(); - if (Dialog::currentBox().sound == -5) { + if (Dialog::indialogue < Dialog::currentDialog().scenes.size()) { + if (Dialog::currentScene().sound != 0) { + playdialoguescenesound(); + if (Dialog::currentScene().sound == -5) { hotspot[numhotspots] = Person::players[0]->coords; hotspotsize[numhotspots] = 10; hotspottype[numhotspots] = -1; numhotspots++; } - if (Dialog::currentBox().sound == -6) { + if (Dialog::currentScene().sound == -6) { hostile = 1; } - if (Person::players[Dialog::currentBox().participantfocus]->dead) { + if (Person::players[Dialog::currentScene().participantfocus]->dead) { Dialog::indialogue = -1; Dialog::directing = false; cameramode = 0; @@ -5785,7 +5785,7 @@ void Game::Tick() } } } - if (Dialog::indialogue >= Dialog::currentDialog().boxes.size()) { + if (Dialog::indialogue >= Dialog::currentDialog().scenes.size()) { Dialog::indialogue = -1; Dialog::directing = false; cameramode = 0; @@ -5936,8 +5936,8 @@ void Game::Tick() Person::players[i]->targetheadpitch = Person::players[i]->lookpitch; } if (Dialog::inDialog()) { - Person::players[i]->targetheadyaw = 180 - roughDirection(Dialog::currentBox().participantfacing[i]); - Person::players[i]->targetheadpitch = pitchOf(Dialog::currentBox().participantfacing[i]); + Person::players[i]->targetheadyaw = 180 - roughDirection(Dialog::currentScene().participantfacing[i]); + Person::players[i]->targetheadpitch = pitchOf(Dialog::currentScene().participantfacing[i]); } if (leveltime < .5) -- 2.39.5