From cdf67289a951aa3f6e4c87862f259f36fc59e8e1 Mon Sep 17 00:00:00 2001
From: Jon Thysell <thysell@gmail.com>
Date: Sun, 12 Dec 2021 15:45:28 -0800
Subject: [PATCH] Added saving of progress to the application's 'SAVE' resource

---
 src/GameEngine.c      |   3 +-
 src/GameSave.c        |  80 ++++++++++++++++++++++++++++++++++++++++++
 src/GameSave.h        |  41 ++++++++++++++++++++++
 src/GameWindow.c      |   7 ++++
 src/GameWindow.h      |   2 ++
 src/Levels.h          |   3 ++
 src/MacCommon.c       |  25 +++++++++++++
 src/MacCommon.h       |  10 ++++++
 src/MacLO.c           |   1 +
 src/MacLO.pi.bin      | Bin 16128 -> 20224 bytes
 src/MacLO.pi.rsrc.bin | Bin 35968 -> 36096 bytes
 src/PlayScene.c       |   1 +
 src/Sounds.c          |   4 +--
 src/WindowBuffer.h    |   2 +-
 14 files changed, 174 insertions(+), 5 deletions(-)
 create mode 100644 src/GameSave.c
 create mode 100644 src/GameSave.h

diff --git a/src/GameEngine.c b/src/GameEngine.c
index dcf26ae..67a69c3 100644
--- a/src/GameEngine.c
+++ b/src/GameEngine.c
@@ -48,8 +48,7 @@ void GameEngine_Init(GameEngine *pGameEngine)
     
     for (level = 0; level < LevelCount; level++)
     {
-        // TODO: Load actual scores
-        pGameEngine->ScoresA[level] = 1;
+        pGameEngine->ScoresA[level] = 0;
         pGameEngine->ScoresB[level] = 0;
     }
     
diff --git a/src/GameSave.c b/src/GameSave.c
new file mode 100644
index 0000000..58ff5ba
--- /dev/null
+++ b/src/GameSave.c
@@ -0,0 +1,80 @@
+// Copyright (c) Jon Thysell <http://jonthysell.com>
+// Licensed under the MIT License.
+
+/**
+ * @file GameSave.c
+ *
+ * This file provides implementations for GameSave.h.
+ */
+
+#include "GameSave.h"
+#include "MacCommon.h"
+
+/** The save resource type. */
+#define SaveResType 'SAVE'
+
+/** The save resource ID. */
+#define SaveResID   128
+
+/** The save resource ID. */
+#define SaveResSize (sizeof(uint8_t) * SetCount * LevelCount)
+
+void GameSave_Init(GameSave *pGameSave)
+{
+    pGameSave->Save = GetOrAddResource(SaveResType, SaveResID, SaveResSize, EmptyString);
+    if (pGameSave->Save == nil)
+    {
+        ShowError("\pGame's SAVE resource couldn't be created!", true);
+    }
+}
+
+void GameSave_LoadData(const GameSave *pSaveGame, GameEngine *pGameEngine)
+{
+    int8_t level, scoreA, scoreB;
+    bool resetA, resetB;
+    
+    HLock(pSaveGame->Save);
+    
+    resetA = false;
+    resetB = false;
+    
+    for (level = 0; level < LevelCount; level++)
+    {
+        scoreA = min(MaxHalfStars, (*pSaveGame->Save)[level]);
+        resetA = resetA || (scoreA < MinHalfStars);
+        pGameEngine->ScoresA[level] = resetA ? 0 : scoreA;
+        
+        scoreB = min(MaxHalfStars, (*pSaveGame->Save)[LevelCount + level]);
+        resetB = resetB || (scoreB < MinHalfStars);
+        pGameEngine->ScoresB[level] = resetB ? 0 : scoreB;
+    }
+    
+    HUnlock(pSaveGame->Save);
+}
+
+void GameSave_SaveData(GameSave *pSaveGame, const GameEngine *pGameEngine)
+{
+    int8_t level;
+    bool dataChanged;
+    
+    HLock(pSaveGame->Save);
+    
+    dataChanged = false;
+    for (level = 0; level < LevelCount; level++)
+    {
+        dataChanged = dataChanged
+                      || ((*pSaveGame->Save)[level] != pGameEngine->ScoresA[level])
+                      || ((*pSaveGame->Save)[LevelCount + level] != pGameEngine->ScoresB[level]);
+        
+        (*pSaveGame->Save)[level] = pGameEngine->ScoresA[level];
+        (*pSaveGame->Save)[LevelCount + level] = pGameEngine->ScoresB[level];
+    }
+    
+    HUnlock(pSaveGame->Save);
+    
+    if (dataChanged)
+    {
+        ChangedResource(pSaveGame->Save);
+        WriteResource(pSaveGame->Save);
+    }
+}
diff --git a/src/GameSave.h b/src/GameSave.h
new file mode 100644
index 0000000..02c7c41
--- /dev/null
+++ b/src/GameSave.h
@@ -0,0 +1,41 @@
+// Copyright (c) Jon Thysell <http://jonthysell.com>
+// Licensed under the MIT License.
+
+/**
+ * @file GameSave.h
+ *
+ * This file provides a GameSave type which manages saving scores to disk.
+ */
+
+#ifndef GAMESAVE_H
+#define GAMESAVE_H
+
+#include "GameEngine.h"
+
+/** Struct containing handle to the save resource. */
+typedef struct sGameSave
+{
+    Handle Save;
+} GameSave;
+
+/**
+ * Initializes the GameSave.
+ * @param pGameSave The GameSave.
+ */
+void GameSave_Init(GameSave *pSaveGame);
+
+/**
+ * Loads data from the GameSave into the GameEngine.
+ * @param pGameSave The GameSave.
+ * @param pGameEngine The GameEngine.
+ */
+void GameSave_LoadData(const GameSave *pSaveGame, GameEngine *pGameEngine);
+
+/**
+ * Saves data from the GameEngine into the GameSave.
+ * @param pGameSave The GameSave.
+ * @param pGameEngine The GameEngine.
+ */
+void GameSave_SaveData(GameSave *pSaveGame, const GameEngine *pGameEngine);
+
+#endif
diff --git a/src/GameWindow.c b/src/GameWindow.c
index 2b76bb7..3a89e94 100644
--- a/src/GameWindow.c
+++ b/src/GameWindow.c
@@ -34,6 +34,9 @@ void GameWindow_Init(GameWindow *pGameWindow)
     // Initialize game engine
     GameEngine_Init(&(pGameWindow->Engine));
     
+    // Initialize game save
+    GameSave_Init(&(pGameWindow->GameSave));
+    
     // Load PICT resources
     Bitmaps_Init(&(pGameWindow->Bitmaps));
     
@@ -44,6 +47,9 @@ void GameWindow_Init(GameWindow *pGameWindow)
     SetPort(pGameWindow->Window);
     FillRect(&(pGameWindow->Window->portRect), WindowPattern);
     
+    // Load data from saved game
+    GameSave_LoadData(&(pGameWindow->GameSave), &(pGameWindow->Engine));
+    
     GameWindow_SetScene(pGameWindow, Title);
 }
 
@@ -144,6 +150,7 @@ void GameWindow_ClearScores(GameWindow *pGameWindow)
     if (ShowConfirm("\pAre you sure you want to clear all scores?"))
     {
         GameEngine_ResetGame(&(pGameWindow->Engine));
+        GameSave_SaveData(&(pGameWindow->GameSave), &(pGameWindow->Engine));
         GameWindow_SetScene(pGameWindow, Title);
     }
 }
diff --git a/src/GameWindow.h b/src/GameWindow.h
index b0e616c..14d6376 100644
--- a/src/GameWindow.h
+++ b/src/GameWindow.h
@@ -17,6 +17,7 @@
 #include "MacCommon.h"
 #include "WindowBuffer.h"
 #include "GameEngine.h"
+#include "GameSave.h"
 #include "Bitmaps.h"
 #include "Sounds.h"
 #include "Scenes.h"
@@ -30,6 +31,7 @@ typedef struct sGameWindow
     WindowPtr        Window;
     WindowBuffer     WindowBuffer;
     GameEngine       Engine;
+    GameSave         GameSave;
     Bitmaps          Bitmaps;
     Sounds           Sounds;
     SceneId          CurrentSceneId;
diff --git a/src/Levels.h b/src/Levels.h
index 3c12f2f..75bae74 100644
--- a/src/Levels.h
+++ b/src/Levels.h
@@ -18,6 +18,9 @@
 /** The number of levels in each set. */
 #define LevelCount 50
 
+/** The number of sets. */
+#define SetCount   2
+
 /**
  * Gets the lights for a given set and level number.
  * @param level The level number.
diff --git a/src/MacCommon.c b/src/MacCommon.c
index 76fd6ea..ecf50fa 100644
--- a/src/MacCommon.c
+++ b/src/MacCommon.c
@@ -164,3 +164,28 @@ void DrawScaledPic(const PicHandle pic, const uint8_t scale)
     DrawPicture(pic, &destRect);
     MoveTo(destRect.right, destRect.top);
 }
+
+Handle GetOrAddResource(ResType resType, uint16_t resID, Size byteCount, Str255 resName)
+{
+    Handle result;
+    
+    result = GetResource(resType, resID);
+    
+    if (result != nil && GetHandleSize(result) != byteCount)
+    {
+        // Resource was the wrong size, delete it
+        RmveResource(result);
+        ReleaseResource(result);
+        result = nil;
+    }
+    
+    if (result == nil)
+    {
+        // Resource didn't exist, create it
+        result = NewHandleClear(byteCount);
+        HNoPurge(result);
+        AddResource(result, resType, resID, resName);
+    }
+    
+    return result;
+}
diff --git a/src/MacCommon.h b/src/MacCommon.h
index 8d5751a..d178750 100644
--- a/src/MacCommon.h
+++ b/src/MacCommon.h
@@ -122,4 +122,14 @@ void GetScaledPicFrame(const PicHandle picHandle, const uint8_t scale, Rect *pDe
  */
 void DrawScaledPic(const PicHandle pic, const uint8_t scale);
 
+/**
+ * Gets the specified resource or creates it if it doesn't exist.
+ * @param resType The resource type.
+ * @param resID The resource ID.
+ * @param byteCount The size of the resource if it needs to be created.
+ * @param resName The resource name if it needs to be created.
+ * @return Handle to the resource.
+ */
+Handle GetOrAddResource(ResType resType, uint16_t resID, Size byteCount, Str255 resName);
+
 #endif
diff --git a/src/MacLO.c b/src/MacLO.c
index ea9e324..e5dc074 100644
--- a/src/MacLO.c
+++ b/src/MacLO.c
@@ -313,5 +313,6 @@ void MacLO_Quit()
     if (ShowConfirm("\pAre you sure you want to quit MacLO?"))
     {
         gExitApp = true;
+        GameSave_SaveData(&(gGameWindow.GameSave), &(gGameWindow.Engine));
     }
 }
diff --git a/src/MacLO.pi.bin b/src/MacLO.pi.bin
index c5f410fd42af22302a175042d4aca74e31ed089a..4463d0ee863ba84357476a45833a6a3ac7341682 100644
GIT binary patch
literal 20224
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
R^&(~-xWd8*`;&bC|3BCaL>mAA

literal 16128
zcmeG@4OCNCn%~O{Az&7fv24mP@|wC79R^}bt%Hmv;U@vZ14%^mxFr!@LTm_3NGx?*
zMQbZ|?P$@n)fu;@4sC_wdb+UfX_>Zz)^W8mGaPE&j;FLeZpXT_uEmbE%CKa=`|=)y
zAMx4Kovu5)b8f!xe)s#k-@W&{_x%K-iyc*#l8iUtYhI;gB}K~&X3Kc-CF=es|E;*c
z=c~c-Ekb?s<{p-y6qcN|0E@9uuU#Ct(Ej9}nzx@By6di_oWswj{OtJ9(2iF<kH(p1
zoIGy|itfr#s?_20TMKRX5G~;=CVDce*cyiYJvVe=Y>E2SOYFZsaq_dTe(_QH^Z#O7
z7drR$>GGq6gFoCqGkgA;mvaC9<i2-z5B>Kr_hs_g1K&6O=iv3m1*iY%#r@ab+BkRC
zvTgTn+Vtc*zvtR(uJ2wlM-f;4+_R5Aao@h<yZ3F0U9)t~aMGHW=BT<#?pLfyK6N0t
zG>N@$-={MY-Z5?4cI=li|FL_?-Fxp|Wd)!I#`-s1n~uPA1pXgKU>5dG35rlATn=4B
zTupKrxim1V$JD3?y5sp)y5nbOFdtR`Xrln~%F4?K2epRw{A4abNDHr#`pUiJ7q5yi
zo#awdRP*u2LVI?und$umAQ=jPG8?RBq$aE`Ve=8rA&h8QNBdR=QDaC3@>JSaJ`h#=
zu%pI<9ORlk)*es$)@()bTh-U^m!Y)OQk-ikQ8vLz>`5#_n!yB&1t9TWx3|g@sOFd)
zG-Ku*)ts+k329LPWIaF-NQ7TN6jesC@FrDEl~6-_7@iJkKzC;Dr91B@<#oDqVK3eJ
zpaRQNbmyYWbZ7Qfx^r<W-Kj64J9GEYods{worNFLoyBsxll9V_C1>f*<*9V1tsF}u
z-5DNN&eKq7;`|o3tHvL;GXp$e;noWcxc?Q@`S?1N1~zQ)a8~yQ4vHO(R=>m7KoGOT
z;}j}x?`Wlz^EtUHzqP8)$AQUF%jJ7rZf_)7S?G29Bbq8%?h(QmNh;$SIRAJevE~o^
zG^)5Vx30F{!}+-h4J_9<k(*aMfpsJl5qb+7M9tNao)tFadmU>%+&Cf;ELqR_B3V)E
zXj~#RBYk{$$Y9v&{0`5A23wuW<>B~&YKT<MQ*vt@Ue{PxMl4R!W~p;jPw0ED!&4RT
zIQ-m*WTcs}d8^wiIsv?g4F&-k!;=QAoF7p#of@Fj$E|nQ1scSv!w1E6>$wJ~9}NO{
z$Xo*)Wg|3<j%y=43Jv_!sYj_=UaCf%XqLJLKOnD*^H&IP70@70p_<~{Ajf&E!W`8U
zw=M#II0E-X;I%v+uaPZ6F_iI&^#$R29bZq1mL&lsX<&iwK}@VXXFcDNppg+8Px-M(
z(LF#GGivkQRJuXr9g+6)lw{G;{kjJij@SzDZL<NwR9^Rbo|dSQX&VdhLidE+9?tM2
z_lAV4zvr3^GYe9Z)y0Nf3kXNtDpb_^+_4z3pbAXacc&nanTj3FQKU2dJu?o91+zV`
z%Va3d2NfC2m2Pi!-6I(_Py@35o|)Igf*M7uxiAAY;##V$^CBbA{X2g3uvkDH=F2T9
zE(YZYQwGTUpSheN7Lm(p%QHeugTH!hU7d&MlJ_@1zDq0-T!o-SF1OcDm>{Y({qX~0
zK`!j8`U6X0aUrGjxNF`12A)gS->tTZCA^0vt5+7Xc@P)wr7_@iaz5ncNMEn~yI3Yh
zC7kk*vj%&6`h#DKMfA{;U!D(2ekBsyoTPpbE-5jQ^`E|WLoA|2W1+1WVvKHot)rgr
zE-j7}fm4i@tpB*?mtqmMSxZ*1ptRNnywyZm2GFhfS3VI7&Nwog?jc-MG|z=h7zt_f
z1N|TPo>)dK=H?TNRh*X#TcrATKDbvblg)85@Zl9Pab2|T|FRM_6E8R7oVS4zXQ<7G
zp~0>Drc!9_$f%`478JD(w>JY9lf>2J!_{<4ucxqo`hzYp9%E*ZbPv4f!L3(c1I}-0
zGfm3sqs5g+U^wcNtUgLyBLq&`OERD`ajg?5a$!~&yWS;vKSi8-t_<IFO;_Q8Oj_=&
z`ac|NY1u0c<1Hn7(Go_5!}Tv=PEEO&y>PQUb$k1nq+LoTVVz*!lhP;TlCn<ZQr5{-
z@%ie$iL+MNpKov0O55?t?2wkxr+0kyn0!6G<BvTNO5O3>f|`Dzh%?<*XtRLI=Jw+a
zDmfhRXD*zV63?u->%8F=3qB;_&#e4dCGe*+E9c?wWy6{elNm2bGl#jqZEt~C#Jp8%
zF|2|ar5?wlqO-TD@e$O>7x8?``#O{NHQ!r(+gdYtKPyoyUqr3^`93auvo@+!vadC=
zo1dY2qC0Lnc2#(il)kr0n++L~y(ZaQT0WCY+8d%I?F~_q_6CKNy#f7~eg}hnm3Rju
zmvjb@(hm-##RTt}B;3KsC5{#?-n|ewa%LQV2O}5nUI@I&9gK8~((Yg+^m2-obo$(0
zalKBK1tgz|$UT9ORS29)CmzA2X28Fs)x_W1POqkj=K+8A)ilLA>50+aZ2y(KM#yup
zZ+1T?Pll#<8{sKp#PhQ0-G)3>BhSme(cNaM^|9cDnDZw&_ep=Y6h8BQ<7dggpmj36
zk9_N=vV<w_Tt0tUJUxzmntnUGNNeH`yTyXq_~+y$))h7?27mo-5C3c)?@A?{fA8?8
zFH=VPw_>EnylIf0i^zU`>-QG;oLj=F{|=Ay6q&#KyU&T4f0FlH(xXk@Ye>EG<liXX
z$xmRXh-c50tXn)os)EB3pKw?)rvF>drlwDxBk!-LPo9&!sr^Pzp7_=d#=T+29Dqcn
zoV-3|80L<Dnl^oI`_|8GBVU`0eB*MbzW<LqEWhi!I@uQ0S~<wS19aj>oL=3yUhu34
zb}ZvB^4*hgEx0UVk&u$X46M^w?2&W<kC30F6+n;jvDiZR?2~Xr%I_NAPInyGBg0R$
zkdEJ)-b!9^WP<!_=l7$1{7#ZD_VMjlkFc-mouplj@=B!R_xrc9AA5EZc|ds@=|qQp
zlJ*Gu+Pq2HiF_Q=W3bpKX^)Vf*jk3KpHQB}j*NkQB1dHZC$=(-$$|3ZB6Gk_ka5?P
z_9+YX5z3Q%jo;SYzI?sg<3@SX_rLl&^5}I8$`jiphITCDuPOZp>U*!EJQ@3$SnT74
zu|B0d=VM6xi0|=O>{!NMQ_2%&lo!`-y&znQkb&f-IY6}yM4c7j9|SlYhKeKsmI|<5
zfGq;-2*a54FhrfAF9M7q9~qN*bF*ufu`#yjAAiGkfelM_dJcZ>R>5{fXPX8?@22j+
z-;=3ZvBkr7(Fc+K1>zrJX*asejiHbkzmhbsG&cgJ$qsd}T~RFisv4MD<lohHb@}z!
zhw6dtlAmxXigvkV!9q5`EQ)P(#--<wFU8p|MIWQGD^m5$_klrM_S7aeke-uguo<xJ
zHO8W8j8QW3U<O)VhwbLnt?4;dTbUJG_hLOObq8{n<y)}c%vcz?OT~7{j>wy^yDH~Z
zb}%}NEf1YDT#t#@l+-i9jC!hf*6LY(-G)I(sE-O}tk{V?khML>KEwtxd=0)TFbzgu
zOMN}|F{UxL@t=oC*j!4aT}V9yiJ6OHo1C(Woot|Dr}?wc^(C3Gi1g7OyJ}~qvh77C
zC8*a%W2DZyJf^|n=Tn=Rc-N;IebKYdjNrUrVR}w3?`zaYE(?(rJ%)4gCNxAm?ow>Q
z9z4cu7`6x9m~f(<@?dpv9?~vo>LBZHw`Uf@Ld(Y~A=}QPMbr;mvbGQ#sGr$(s$wUD
zW1%W#Z#d($4Ej*!x)_{~a!nZr*Z{^4afl;v<7>${64}x5PW(onX_UQGuj<|P%ImUr
zrw03dDfl-`sm82P+hYwELFuQqs(X(uKNY&VtGRc(Q^p1~5X>Na3>BQKDJ}Ut)XkI_
z4?)5L@(pfc@Gj%aW;dvqlD02&YV_dp+=};)W~nu5?-G}$%-~AEl3H$X0USXL06o&B
zg|P3kq4&y0@SX^~@4fcWF!5W~qMHY*A~(c38Jlrke3{YNSYOq43gLCaj~sjY+8|EA
z4-;Hv3=O%~*47}8oX~T>RLkC8?(9)HmgYE5AXO2&4*ohcth=YepxH2VvG3WIq6phH
zeb0og3qEFvb+na6^ow;73i=0l{eM8+bZAI-&l;k8N8hu3*prr`2MnR%tT)*oV{b7+
z)F=60s^R?)veYgeMrp1quFT+^9kxeZw5tWI%N{3S$LtD}I*%4xa5RX9v&3U&!%!lV
zJ(O5<2xo1YE)CLLnz?D9US-VvFNlBdBFNugr5jqBW4t@zBK$}<)Hbl(;Jk!mtmo&S
z-g$!P_){N~{ii-($Pc`pq_@-HN6y&`QJeW4m+H(D9fv^9$u(&pkB~fraz~ib`uLWn
z3){6vFFXy#CeR*3eWgCoskLgEepBeP?HC&-YnDAhGY{k~&AOw+8{IM9larxK_JvG*
za0R0uFQIa?H$di6XQ33vV3xT)9*7isL-X<Slc5178)6x~Q|3^xy||7*n-hHN=LH(2
zHs{cRmkT<YT?$<9>2^l72;@{IM`{{-0@h?gO>LJWZBFiB=$NLN4Fum}16Qx(Y}x=a
zWjE05-vQ2gT;n;pC3*Qvp)JT%mg2f+lx!ev!(h9{vir>MH~;SFduRB1%dsKQYqHd8
zZ2M{79-g*Qpeb9r2Dk7Ok3fm<>l*a%l+^-7uGoy7h$pi-bZ}(8<A{e|x6ASOESYr}
z*-D){OZ`g4%2T1iBBN`V9bkq8+TIA-pg=QvV|N*96}@`H0LZlQgdew{Ops?9K(5II
zWo9Mj^3QT$E~HXs<MDUWU_NEeKl!UOd1j;0*nPBji{)d;(WIc|2~rC%%fo(b-!Vn|
zV+?f*j`Ul!t41{xHLXi7+PqGc*Oa#zZ8P{A$ZJ9@k*5T(EtYRlAT^MYL%xacXsS|Z
z0C%LoE8EtpnvR<FIxy<ZdN$CpZEaEpj}xldv;@qipB&Xjn@zfCHb5eBzWMxi<htH;
zw0oP5KGvN<n@zvzHk<mkamto0YvshgRd4@vBaj^d=Za!!G|rP0lI2qMSfA1MVrmLA
zBaJRIeQqi<Wk=f+$8a^5nG{<AHVv=XnF(z#X;U!!M>#(v^X#|zKQ%d%89Jy(EeDzJ
zpw88ZwWL{@Wx;v%6po1eg*l88>Bcnk2+u-h8AIFEW2|V(OpKnvXlxqJRAQF5{H{Bg
z(f0G@zYd+-cRba?>snTnkGsyjxDIfvbvbPVxq~<2F|w~9{srQ1BHoJl6~v!Ld@tgE
zM7%X(&x~i%Akh_zzsauI>>&7&uO9iXBA*}Y)mXO+bsyGk=uI8YLHrj1C~-Zn$DJu>
z%+8dK5>AvDKxjmG1z|Qqaw5?o{3F8o2yq_)4O7VmwA2d)bItXt7v^ZGph-K#zQLTr
z-y6)k;WkYTD1#|liYW}5*Z|2J<ic2HhpxKhjNZ6wlp1cE?3WyjNB?0=w>I>~HzO&T
zIs);+zv7-2{uTER%gBET01mFSl;k2jLe5$UyGT|68cvXN57w`d6An2wl9LU>IP0on
zQcucd3rq-8t%a-e5$f`cRvW@4dB&Bby@;GHfTGItj4MnCy|(-c(*6{GdPl`{dk&tX
zLm`}4$LaRPxc&()PewZa!-U}URm9`N_zzAZ&($!#U<cxtKt^~L4AAY_`1YE|uOprZ
zR46nXbf|xEPndtP5%DwuFF^bg0WU&)u7I<Me~AB8Bt8(?>xkifUQ{FEL(oL%Q9;Dd
y2zWc<y<r~~m!VyA*oVdCNN*D8tC4<2pg)ATHf$^EDdbUy|9wa;#8CWMuKxjxC-FW2

diff --git a/src/MacLO.pi.rsrc.bin b/src/MacLO.pi.rsrc.bin
index da1b709f13228876d1aea683d00a77e72637a101..9e8883e1580d6cf9f78b9a4d57311c7edf5ceec0 100644
GIT binary patch
delta 703
zcmY+>O=uHA7zW^XHy0bFRwIff>e_0Jf*?|%NGRs7Cc4>_B>sVTuxYVSiWn7<Vm2|&
zPdBYeH)<6rA|84uQfLJ$B1J+^9z;acP>(@8dhp;SzO(h>!tg%dd^5u^t3Q(U$8!0C
zz2sUOZ=71I*J70|JGQ6O#TD?AI0}nEp2K#dQa&uzD{qf&tgp_9E>Lorl9XB0rEp$G
zf*wl!zr|)aYHba!blN)LI2Y3V^s}%}jWAz$HNVPy-4_k?F;_!At&{n2cpxeA`^~{?
zN#@Vtfsr2OZ)P_yC9}_3YGsPL-J?e1kfbhuC>~THOTA&QC(6d<a6mi5#;9M7oMfE~
z`63!~x<BNLW2ZEm98D;Y<<BwC*#IE_fsV}z><wPqEEOkJo3R|^T)TpnI4=NX;Aa1#
z<utk#<Q-h&hTd!fEw{OE+dpUNHl)RT?j^m+9Gp;6He>6j^+~6l{(y{F;H=T_aaVZP
z9Ui!Xtnlt0`VGb{|Ds<ZC%k8#UP4}28KM_Z5Z<fM^C(*WM$chFxT8uxhtW*2=+sy|
zMM*UFZJ?iE((*fc22;ZO$LK2V33nZ(%P3p^L6<Nsd|;N&!W4G((>kic2W5H;_bo5b
zx9~vN%`;n<uj8R8dZ*a9YE}%Tn<yxN7dUi@9#JF&fg{K1D~b&MuM;jhvHq_4(|oEg
M=2s(T&Z+1B0$#x5R{#J2

delta 676
zcmY+>K}b|l6b9h`z5&q*6elQ($*x*vQ6QmVA)zy)_43Udo1R1xfmnhdEgEnU;k=pD
z(V0<adS>LJrK?$lHq^>Rv<hjbi@;3_Y1P6OkqF~C$3^tu@_*-^!{uI{yJEO+jlu(e
zuCz0~duM0!&&Oi@$rGv6!FAB5XwCKm8Ct&KV&RJVUEJt6w)yuecY$2VQ!2ggs%R$p
z|E#Zkw-DfwpsyBz`=%WsuSCOEjB+((M=Z*<zIbmR<%Suyn<>AJjU+g?C!Rb@Q2rPj
z8SkY0McGcdPkpLY6(!Xw&|}3NDAf=#oo)+;x)u%f#Hle9?X?G~F&eRAx2T>p!!esO
zJ79(#oKnk)r;jxZ;~QMmY4~^PaPMGlo-YO3JFQXU_{y<QNTZAT56LB@(5{g=PW}M5
zQUPk7AI*!W#3}YnneA<5b@Jb4&@WE&K=6zBCHu^zc#7S?uLY*Xd*T`P*^)TJ)}!KC
zcB2;0iNA}p?4~7gu9BppnO;s`o*U<?#q;9N;sy5k7ve>B%hAs*h=0odEB1wVVvpTA
zAYNi$G{mpP@5RgPE;_T8$~RoxT;PVM^179wfe>)%kyzn2&~`&?fNt9@Gu~kSo_E=D
F4goPBs3rga

diff --git a/src/PlayScene.c b/src/PlayScene.c
index f376278..f268760 100644
--- a/src/PlayScene.c
+++ b/src/PlayScene.c
@@ -218,6 +218,7 @@ void PlayScene_Click(GameWindow *pGameWindow, const Point *pPosition)
             // Level was completed in the last click
             GameEngine_CompleteLevel(&(pGameWindow->Engine));
             GameWindow_Draw(pGameWindow, false);
+            GameSave_SaveData(&(pGameWindow->GameSave), &(pGameWindow->Engine));
             GameWindow_SetScene(pGameWindow, LevelEnd);
             Sounds_PlayDoneSnd(&(pGameWindow->Sounds));
         }
diff --git a/src/Sounds.c b/src/Sounds.c
index ec6ea9f..de6fa40 100644
--- a/src/Sounds.c
+++ b/src/Sounds.c
@@ -10,10 +10,10 @@
 #include "Sounds.h"
 
 /** The first snd resource ID. */
-#define SndBaseResId  8192
+#define SndBaseResID  8192
 
 /** The click snd resource ID. */
-#define ClickSndResID SndBaseResId
+#define ClickSndResID SndBaseResID
 
 /** The retry snd resource ID. */
 #define RetrySndResID (ClickSndResID + 1)
diff --git a/src/WindowBuffer.h b/src/WindowBuffer.h
index a94ff5a..9530d29 100644
--- a/src/WindowBuffer.h
+++ b/src/WindowBuffer.h
@@ -38,4 +38,4 @@ void WindowBuffer_StartDraw(const WindowBuffer *pWindowBuffer);
  */
 void WindowBuffer_EndDraw(const WindowBuffer *pWindowBuffer);
 
-#endif
\ No newline at end of file
+#endif