From f9103548cf54894c92afc29e58ca2f2b2432f740 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Fri, 13 Oct 2023 12:15:13 +0200
Subject: [PATCH] =?UTF-8?q?-=20Ara=20gamestate=5Fsequence=20llig=20les=20s?=
 =?UTF-8?q?equ=C3=A8ncies=20en=20format=20text.=20-=20Llevades=20totes=20l?=
 =?UTF-8?q?es=20sequ=C3=A8ncies=20en=20format=20binari.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/seq00.seq                | Bin 518 -> 0 bytes
 data/seq05.seq                | Bin 190 -> 0 bytes
 data/seq10.seq                | Bin 213 -> 0 bytes
 data/seq15.seq                | Bin 241 -> 0 bytes
 data/seq20.seq                | Bin 249 -> 0 bytes
 data/seq25.seq                | Bin 72 -> 0 bytes
 data/seq30.seq                | Bin 868 -> 0 bytes
 data/seqIN.seq                | Bin 595 -> 0 bytes
 source/gamestate_sequence.cpp | 149 +++++++++++++---------------------
 9 files changed, 55 insertions(+), 94 deletions(-)
 delete mode 100644 data/seq00.seq
 delete mode 100644 data/seq05.seq
 delete mode 100644 data/seq10.seq
 delete mode 100644 data/seq15.seq
 delete mode 100644 data/seq20.seq
 delete mode 100644 data/seq25.seq
 delete mode 100644 data/seq30.seq
 delete mode 100644 data/seqIN.seq

diff --git a/data/seq00.seq b/data/seq00.seq
deleted file mode 100644
index 91307a8df5ff7dde28c5b9ecf20d7be6c0ca7dff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmZXQ-Acni5QR5cMRQRQi-;Cw0z&Tsv3-GQI<?zwvg!Vm-uJp7h)?0m^)Y-5XA{tX
zH(?>?oH^%vxwt-ke$0x~`z*;E?aH!vQ!Du;#v&bI00fP&L8Wu?Ez^Ob6q!iw$hBlC
z<j@#!xS#-}oh;d%jQNk!+QBXmtQD-W$;J8VvOn|Moymj{$;7K>$swJPnw2$;N4qz!
zC<;C*vv_HOoHU2lsmiqI$-$ChH418wI_px24e9*?*ZEM7P%BQ96sJ8OaE}@`2E3&O
zYE8V<lctqvRE2*%=f6Eg9AtQC&BsX{l<oWVP<q|8!=`|oC)i?Zw3buxB+?sh8#y=v
zt3ouMuZG4Wi{!|eiurM?YD-og#Z<^!1x|HzLr40*)kNzfV~3gof3W3#{J^ELwX!5l
X%z40i0ii)?Emoc<Mt&Z3-qHI3bA4`Z

diff --git a/data/seq05.seq b/data/seq05.seq
deleted file mode 100644
index b6c2344bb0ae3b4a709da7639c18a3a4577a2ef1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmYk#O%8%E5QgCbaY2kR(S>nAGF+gEBpzU>1CF6B^v8HRui=qAh6OgR=X>VeWu>R7
zxyYWo;w_FMKRn5BtU)<aFhznpr9&n1eQ>tL00Y7Ud8ox_yIFO!=rZZ-JPRCp>)31Z
z&`|_bETt6RB41j6>k~SJz~<)CY?eNb<j@sm3TD+6G>+*B>K2ss0q8YaLq;*K`5(zw
BD8K*!

diff --git a/data/seq10.seq b/data/seq10.seq
deleted file mode 100644
index ccdd821feaa5dcb18e07b7cc6b72d41234c3ad13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 213
zcmYk0OA5k35JY<tM1q^(2i*ug7ZB7FG^P^<=9l^8dS1h0cnptWVzO{k1qH8owWuQZ
z_v@uoZTSQSQL`oMA~uYMLql?$9f++Vh2(=9C~(H~a1vgd)r{YMcm+Es4u&+Vgi&>w
zByz%mR99AThT=rna=>gck{-yDO{6tP3Gemt^e3|KGoyC_r)GnVvn1hD&OXPOJx?aA
M<0zWPAirFF0TW~|9{>OV

diff --git a/data/seq15.seq b/data/seq15.seq
deleted file mode 100644
index 0b3493da33aa355a09fa6f1e170068102a441e37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmZXOOAdlS42BDY7~@7XF>XjI8+VgvyucupOfnB(7%t`7wb$?%9>Zf;U}Itzeg6I0
zELwVMFDFr}Tk?cE#9PBAgutt;Bo0(_;K>8x4OwghRb<eRb)H4=UZgYOJP~rpA=(e5
zYOGwT>A(Qa`%X1nz$b~Pb3fu8c_fX-F|x;sv}btmNe)Md)<!lwFG{JME5>`T)gK|_
bpU^s{c=Vy6PR`5RmtOJ5qqoY|fw$8yf|E0x

diff --git a/data/seq20.seq b/data/seq20.seq
deleted file mode 100644
index 1f26e9f5a7e4e4811e41399c28fed858b79c6c77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 249
zcmZXO!3u&v5QbMJBBCJb6bQdwx(ODYIt{wjitFgE2EA#I(PQ)&O?C-74Kwq9^UW%l
zdEFiJ>|)N*N$pg)Oe=!6Am_}DdKu;_To7tPMW#-YBvsGp<jd_xE>^J$*5nPkL8IrA
zJqAz4N3mQCR=S2Y-ZE;wm?q0I^_YjF_lMsIbmKb+B{|#~wml^375xRbveGEnwoVin
g8ba%IVc65xhvG`|NH3QpH)zLTG*piLr;2{^2L8n}V*mgE

diff --git a/data/seq25.seq b/data/seq25.seq
deleted file mode 100644
index 6e9d77e3a9d5237c08ecaa6164039cde78f61d3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmZQ&<P3HVG&9t5_jF^P&mhdeAmZVv;Nhs?=;I!$;OiQ!;HVH7>IsyRWnd6<4N(Yj
Z^$P}yxGK2%xdr+Ag*XN&GVI`H1ppZ-53m3L

diff --git a/data/seq30.seq b/data/seq30.seq
deleted file mode 100644
index 9388b093def05a9b785cd5d18b992e8cc031f880..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 868
zcmZvazmC&D5XL7l$H{~v2M#A1q{%hcS>lgGLo=}_W};nhvb#P`wA9qpbV$^xp-o2z
zkHKTyV=!yyq)3;_+TCw{^UXJYKgt7d-n}XtS!OxpFfKNoU@g|Q5|BNI`FsxlPRG6O
zb<)9YHb|e<u8Pj%f~v?~oKfX%cAy+&7i;zoR}R<Q2D&EPbd0gn#{$Mv%SfxPCNCVy
zvV^~rL%>!oji!Q;@xxvi%WSKaqYLtcE5g=U4vAUoCw9jGGdAeFG}4kOk>o~{Hc(!W
z_uLqYsG4N#nxw%cd*z%A;k@a?xze6c^rNg@4D7Wra)^{&!ApSW!I`cS*D9%2RCF;-
z^J}_?yzL=7_zIABt)@|_EZf01J+DYiLpp`ZhvDzkp8+Oo?;1~*YUfq|1>jVVOR0jM
zl=jeeK`I(h51LL~_8YbUXP(j$@e^6+N$-9FoL@#wF|`{ucX_N~uJ}rqfvHH_J?`}!
zq-ojfmG+#ZtA%$;OE-rzr1KAeN0x&A6G@l-Np_w{3OI0w4ST!ybC%ve@?sEc<qlvb
zNGU!2`Aq1&vOgNk?9L~LHCIB$avPPQmJ2d{C3)AiwXRCnrZ4JzR&gyJ4J9jtVktI!
sF9j9mwF)a;=04e{R{v0^b%L6)F>LQuX$<E}X+xsx(ry%9!uR6jKex%mTmS$7

diff --git a/data/seqIN.seq b/data/seqIN.seq
deleted file mode 100644
index 2cb81831dbcd3021b8727fdd29a87b49ae5c6950..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 595
zcmYk3zfu%I5XO6NMHCd&D=j3jW;Y>Q{v24QeS5uoQ#CiU%+6dvNC4DXu23Ka0T18{
zm{<myo0<3+K8BA$&)$g_Ow!-izxld*^TDI$>T)}4&U?|*_eYZtr$^24Wp+9_f$ysi
zTXClq7v1n6D`jzC?zQFR$;VF@XItAriZ|d3z|uQ0ASFiVB>auJ_6^{<!oIQSjFl{k
zqL7SPh-S?@v*w=w>)cscQ&4TJ=wt54N}~kT4w>`|;7w(zLW|l7w$|i@HeN_QChf8;
zo5%KA>@{>DdX?s;q){L#HV@=j4!lwEHLOFlb|@;ZYSe?N-Z#!DW@VjOzA5M?fL?Mr
zH@c?M%YYkW$QR!P&dPr<yVCh6yKNK`26$bOH3C)XHLs#Zo=4Zxa|irc{P*M3-@pcR
zx+xtdVnhNpKT(h!QQSZVofRhJ#yX@hc?!Rm?>D;F{&x#s0iKXW-lQ@nNs@4oTlfL6
zCdCj1=>uP&6AJlU`(A2H<|%JmN&}C1wv;_NmdHahhXXu==mie>s7ma6Vp_>c3ZJ_R
EcNCC}Gynhq

diff --git a/source/gamestate_sequence.cpp b/source/gamestate_sequence.cpp
index 6cb48e8..b7cb912 100644
--- a/source/gamestate_sequence.cpp
+++ b/source/gamestate_sequence.cpp
@@ -19,30 +19,9 @@ namespace gamestate
 {
     namespace sequence
     {
-        int num_diapositives = 0;
-        char *sequence_file = nullptr;
-        char *sfpointer = nullptr;
+        FILE *sequence_file = nullptr;
         uint32_t wait_until = 0;
 
-        uint8_t getByte()
-        {
-            return *(sequence_file++);
-        }
-
-        uint16_t getWord()
-        {
-            return getByte() + (getByte() << 8);
-        }
-
-        std::string getString()
-        {
-            uint8_t tamanyCadena = getByte();
-            char filename[256];
-            for (int i=0; i<tamanyCadena; i++) filename[i] = getByte();
-            filename[tamanyCadena] = '\0';
-            return std::string(filename);
-        }
-
         void drawPic(std::string filename)
         {
             draw::surface *pic = draw::loadSurface(filename, true);
@@ -82,13 +61,15 @@ namespace gamestate
             {
                 if (!draw::isfading() && (input::anyKeyPressed() || input::mouseBtn(1))) {
                     wait_until=0;
-                    if (input::keyPressed(SDL_SCANCODE_ESCAPE)) num_diapositives=0;
+                    if (input::keyPressed(SDL_SCANCODE_ESCAPE)) fseek(sequence_file, 0, SEEK_END);
                 } else {
                     draw::render();
                     return true;
                 }
             }
-            if (num_diapositives==0) {
+            if (feof(sequence_file))
+            {
+                fclose(sequence_file);
                 const int fase = game::getConfig("fase");
                 if ( fase == -1 || fase == 30) {
                     gamestate::menu::init();
@@ -96,70 +77,52 @@ namespace gamestate
                     gamestate::prefase::init();
                 }
 
-                free(sfpointer);
                 return true;
-            }
 
-            const char tipo_diapositiva = *(sequence_file++);
-            switch ( tipo_diapositiva )
-            {
-                case DIAPO_ESPERAR:
+            } else {
+
+                char text[100];
+                int x, y, val;
+                int res = fscanf(sequence_file, "%s", text);
+                if (res==1)
                 {
-                    const uint16_t time = getWord();
-                    wait_until = SDL_GetTicks() + time;
-                    printf("- Esperar(%i)\n", time);
-                    break;
+                    std::string command(text);
+
+                    if (command=="ESPERAR") {
+                        int res = fscanf(sequence_file, "%i", &val);
+                        wait_until = SDL_GetTicks() + val;
+
+                    } else if (command=="FADEIN") {
+                        int res = fscanf(sequence_file, " '%[^']'", text);
+                        drawPic(text);
+                        draw::fadein();
+                        draw::render();
+                        wait_until = SDL_GetTicks() + 500;
+
+                    } else if (command=="SHOW") {
+                        int res = fscanf(sequence_file, " '%[^']'", text);
+                        drawPic(text);
+                        draw::render();
+                        
+                    } else if (command=="PRINT") {
+                        int res = fscanf(sequence_file, " %i %i %i '%[^']'", &x, &y, &val, text);
+                        drawText(x, y, val, text);
+
+                    } else if (command=="PLAYMUSIC") {
+                        int res = fscanf(sequence_file, " '%[^']'", text);
+                        audio::playMusic(audio::loadMusic(text));
+                        
+                    } else if (command=="FADEOUT") {
+                        draw::fadeout();
+                        wait_until = SDL_GetTicks() + 500;
+
+                    } else if (command=="FADEOUTMUSIC") {
+                        draw::fadeout();
+                        audio::fadeoutMusic();
+                        wait_until = SDL_GetTicks() + 500;
+                    }
                 }
-                case DIAPO_FADEIN:
-                {
-                    std::string filename = getString();
-                    drawPic(filename);
-                    draw::fadein();
-                    draw::render();
-                    wait_until = SDL_GetTicks() + 500;
-                    printf("- FadeIn('%s')\n", filename.c_str());
-                    break;
-                }
-                case DIAPO_SHOW:
-                {
-                    std::string filename = getString();
-                    drawPic(filename);
-                    draw::render();
-                    printf("- Show('%s')\n", filename.c_str());
-                    break;
-                }
-                case DIAPO_PRINT:
-                {
-                    const uint16_t x = getWord();
-                    const uint16_t y = getWord();
-                    const uint8_t col = getByte();
-                    std::string text = getString();
-                    drawText(x, y, col, text);
-                    printf("- Print(%i, %i, %i, '%s')\n", x, y, col, text.c_str());
-                    break;
-                }
-                case DIAPO_MUSICA:
-                {
-                    std::string filename = getString();
-                    audio::playMusic(audio::loadMusic(filename));
-                    printf("- PlayMusic('%s')\n", filename.c_str());
-                    break;
-                }
-                case DIAPO_FADEOUT:
-                {
-                    draw::fadeout();
-                    wait_until = SDL_GetTicks() + 500;
-                    printf("- FadeOut()\n");
-                    break;
-                }
-                case DIAPO_FADEMUSIC:
-                    draw::fadeout();
-                    audio::fadeoutMusic();
-                    wait_until = SDL_GetTicks() + 500;
-                    printf("- FadeOutMusic()\n");
-                    break;
             }
-            num_diapositives--;
             return true;
         }
 
@@ -171,20 +134,18 @@ namespace gamestate
 
             switch (fase)
             {
-                case -1: filename = "seqIN.seq"; break;
-                case  0: filename = "seq00.seq"; break;
-                case  5: filename = "seq05.seq"; break;
-                case 10: filename = "seq10.seq"; break;
-                case 15: filename = "seq15.seq"; break;
-                case 20: filename = "seq20.seq"; break;
-                case 25: filename = "seq25.seq"; break;
-                case 30: filename = "seq30.seq"; break;
+                case -1: filename = "seqIN.txt"; break;
+                case  0: filename = "seq00.txt"; break;
+                case  5: filename = "seq05.txt"; break;
+                case 10: filename = "seq10.txt"; break;
+                case 15: filename = "seq15.txt"; break;
+                case 20: filename = "seq20.txt"; break;
+                case 25: filename = "seq25.txt"; break;
+                case 30: filename = "seq30.txt"; break;
             }
 
             int filesize;
-            sequence_file = file::getFileBuffer(filename, filesize);
-            sfpointer = sequence_file;
-            num_diapositives = *(sequence_file++);
+            sequence_file = file::getFilePointer(filename, filesize);
 
             game::setState(&gamestate::sequence::loop);
         }