Fixing stuff
This commit is contained in:
1 parent
2ee288cbe0
commit
b98631a8c0
54 files changed
+9
-9105309
No files matched your search
+4
-4
@@ -512,16 +512,16 @@ namespace ZL
|
||||
if (event.type == SDL_KEYDOWN && event.key.repeat == 0) {
|
||||
switch (event.key.keysym.sym) {
|
||||
case SDLK_1:
|
||||
if (audioPlayer) audioPlayer->playSoundAsync("audio/background.wav");
|
||||
//if (audioPlayer) audioPlayer->playSoundAsync("audio/background.wav");
|
||||
break;
|
||||
case SDLK_2:
|
||||
if (audioPlayer) audioPlayer->playMusicAsync("audio/lullaby-music-vol20-186394--online-audio-convert.com.ogg");
|
||||
//if (audioPlayer) audioPlayer->playMusicAsync("audio/lullaby-music-vol20-186394--online-audio-convert.com.ogg");
|
||||
break;
|
||||
case SDLK_3:
|
||||
if (audioPlayer) audioPlayer->stopMusicAsync();
|
||||
//if (audioPlayer) audioPlayer->stopMusicAsync();
|
||||
break;
|
||||
case SDLK_f:
|
||||
currentLocation->dialogueSystem.startDialogue("test_choice_dialogue");
|
||||
//currentLocation->dialogueSystem.startDialogue("test_choice_dialogue");
|
||||
break;
|
||||
|
||||
case SDLK_e:
|
||||
|
||||
@@ -151,7 +151,8 @@ void DialogueOverlay::drawDialogue(Renderer& renderer, const PresentationModel&
|
||||
nameRenderer->drawText(model.speaker, nameX, nameY, 1.0f, false, { 1.0f, 0.88f, 0.45f, 1.0f });
|
||||
}
|
||||
|
||||
const std::string wrappedBody = wrapText(model.visibleText, 90);
|
||||
//const std::string wrappedBody = wrapText(model.visibleText, 90);
|
||||
const std::string wrappedBody = wrapText(model.visibleText, 56);
|
||||
bodyRenderer->drawText(wrappedBody, bodyX, bodyY, 1.0f, false, { 1.0f, 1.0f, 1.0f, 1.0f });
|
||||
|
||||
lastChoiceRects.clear();
|
||||
|
||||
Reference in new issue
Block a user