From 3a0cba54bad3222a9e969c1bc102422624163cf2 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Sun, 22 Oct 2023 13:30:49 +0200 Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20Quan=20se=20pillen=20les=20sequ?= =?UTF-8?q?=C3=A8ncies=20del=20data.jf2=20peta=20per=20que=20no=20hi=20ha?= =?UTF-8?q?=20EOF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/seq00.txt | 1 + data/seq05.txt | 1 + data/seq10.txt | 1 + data/seq15.txt | 1 + data/seq20.txt | 1 + data/seq25.txt | 1 + data/seq30.txt | 1 + data/seqIN.txt | 1 + source/gamestate_sequence.cpp | 10 ++++++++++ 9 files changed, 18 insertions(+) diff --git a/data/seq00.txt b/data/seq00.txt index befeb8a..2bfec9b 100644 --- a/data/seq00.txt +++ b/data/seq00.txt @@ -34,3 +34,4 @@ PRINT 79 29 3 'ELS MEUS MAPES US ADORMIRE' PRINT 79 39 3 'AMB UNA PRACTICA DE TAL!!' ESPERAR 2000 FADEOUT +END diff --git a/data/seq05.txt b/data/seq05.txt index d7da8b1..ef8ae40 100644 --- a/data/seq05.txt +++ b/data/seq05.txt @@ -11,3 +11,4 @@ PRINT 9 19 1 'ARA TINDREU QUE SUPERAR' PRINT 9 29 1 '5 MAPES AMB COST EXPONENCIAL!' ESPERAR 3000 FADEOUT +END diff --git a/data/seq10.txt b/data/seq10.txt index 9476431..258240f 100644 --- a/data/seq10.txt +++ b/data/seq10.txt @@ -14,3 +14,4 @@ ESPERAR 1000 PRINT 159 79 1 'SUPEREU ELS MEUS MAPES!' ESPERAR 2000 FADEOUT +END diff --git a/data/seq15.txt b/data/seq15.txt index 4b57936..b814e2d 100644 --- a/data/seq15.txt +++ b/data/seq15.txt @@ -15,3 +15,4 @@ PRINT 29 29 1 'QUE NO ELS SUPERA' PRINT 29 39 1 'QUASI QUASI NINGU' ESPERAR 3000 FADEOUT +END diff --git a/data/seq20.txt b/data/seq20.txt index a02a207..5f513ad 100644 --- a/data/seq20.txt +++ b/data/seq20.txt @@ -15,3 +15,4 @@ PRINT 29 29 1 'O ME COMPRAIS UNA PRECIOSA' PRINT 29 39 1 'CHAQUETA DE CUERO O NADA DE NADA' ESPERAR 3000 FADEOUT +END diff --git a/data/seq25.txt b/data/seq25.txt index f5ea8a1..ed26acb 100644 --- a/data/seq25.txt +++ b/data/seq25.txt @@ -3,3 +3,4 @@ PRINT 159 19 0 'HI HA ALGU MES A QUI' PRINT 159 29 0 'ET TENS QUE ENFRONTAR!' ESPERAR 3000 FADEOUT +END diff --git a/data/seq30.txt b/data/seq30.txt index 1420443..b1aaf4d 100644 --- a/data/seq30.txt +++ b/data/seq30.txt @@ -59,3 +59,4 @@ SHOW 'SEQ74.GIF' PRINT 169 129 0 'FINS LA PROXIMA.' ESPERAR 5000 FADEOUT +END diff --git a/data/seqIN.txt b/data/seqIN.txt index 96f34a7..3e0a765 100644 --- a/data/seqIN.txt +++ b/data/seqIN.txt @@ -46,3 +46,4 @@ PRINT 109 9 1 '"LA CAGAMOL!!!' PRINT 109 16 1 'AHORAL QUE HAGOL!"' ESPERAR 5000 FADEOUT +END diff --git a/source/gamestate_sequence.cpp b/source/gamestate_sequence.cpp index 1e5ec0c..49193b8 100644 --- a/source/gamestate_sequence.cpp +++ b/source/gamestate_sequence.cpp @@ -107,6 +107,16 @@ namespace gamestate } else if (command=="FADEOUTMUSIC") { draw::fadeout(); audio::fadeoutMusic(); + + } else if (command=="END") { + fclose(sequence_file); + const int fase = game::getConfig("fase"); + if ( fase == -1 || fase == 30) { + gamestate::menu::init(); + } else { + gamestate::prefase::init(); + } + return true; } } }