From 08888717c5bcc6f57f9d706d91346c6ce4bf9911 Mon Sep 17 00:00:00 2001 From: GeoffreyFrogeye Date: Tue, 8 Apr 2014 18:09:21 +0200 Subject: [PATCH] Implemented scores & local best score * Should have been aligned on the right, but had issues with the log() function * Best score is currently reset every time you launch the game * Removed useless project files --- .gitignore | 5 +- 2048.G1A | Bin 23636 -> 20084 bytes 2048.c | 27 +++++- 2048.dlr | 235 ----------------------------------------------------- 2048.dlw | 126 ---------------------------- 5 files changed, 29 insertions(+), 364 deletions(-) delete mode 100644 2048.dlr delete mode 100644 2048.dlw diff --git a/.gitignore b/.gitignore index aa4cba5..8d0fa54 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ /SDCard/* /imgres/* *.sublime-* -*Thumbs.db \ No newline at end of file +*Thumbs.db +*.dlw +*.dlr +*.G1A \ No newline at end of file diff --git a/2048.G1A b/2048.G1A index 66a1cf3f973a3a9dbc9dab222ac40c0699e7317f..a823ee4b9fa4520689eab9da2e20456a7a37a463 100644 GIT binary patch delta 2520 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 I06F^mAD=G%Z2$lO diff --git a/2048.c b/2048.c index 0e5a55b..5294bbd 100644 --- a/2048.c +++ b/2048.c @@ -3,6 +3,7 @@ #include "MonochromeLib.h" + // Sprites char tile[14][26] = {{127,240,213, 88,170,168,213, 88,170,168,213, 88,170,168,213, 88,170,168,213, 88,170,168,213, 88,127,240}, {127,240,128, 8,128, 8,135, 8,136,136,128,136,129, 8,130, 8,132, 8,143,136,128, 8,128, 8,127,240}, @@ -61,6 +62,26 @@ int Storage_bestScore = 0; Grid Grid_grid; // Usual functions +unsigned char* intToStr(unsigned char* c, int n) { // Code par Eiyeron, Licence Creative Commons BY-SA + if(n==0) { + c[0] = '0'; + c[1] = 0; + } else { + int i, l=0; + if(n<0) { + c[0] = '-'; + n = abs(n); + l++; + } + for(i=n ; i ; i/=10) + l++; + c[l] = 0; + for(i=n ; i ; i/=10) + c[--l] = i%10+'0'; + } + return c; +} + int rand_int(int min, int max) { return min + (rand() % (int)(max - min + 1)); } @@ -184,11 +205,13 @@ int Screen_drawMovingTiles(float percentage) { } void Screen_updateScore() { - PrintXY(100, 14, "0", 1); + unsigned char chaineScore[6]; + PrintXY(70, 14, intToStr(chaineScore, Game_score), 1); } void Screen_updateBestScore() { - PrintXY(100, 35, "0", 1); + unsigned char chaineScore[6]; + PrintXY(70, 35, intToStr(chaineScore, Storage_bestScore), 1); } void Screen_message(bool won) { diff --git a/2048.dlr b/2048.dlr deleted file mode 100644 index d5d074b..0000000 --- a/2048.dlr +++ /dev/null @@ -1,235 +0,0 @@ -[DLSimRunSpace] - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=184 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=149 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=130 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=198 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=204 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=210 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=150 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=117 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=124 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=151 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=147 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=157 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=158 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=54 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=54 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=49 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=47 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=46 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=45 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=55 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=55 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=147 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=147 -Flags=00001012 -Sublevel=3 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=220 -Flags=00001012 -Sublevel=1 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=210 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=220 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=117 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=157 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=149 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=158 -Flags=00001012 -Sublevel=2 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=188 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c -Line=321 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c -Line=323 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c -Line=330 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c -Line=343 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=191 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=477 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=474 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=475 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=197 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=194 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=473 -Flags=00001012 - -[Breakpoint] -File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c -Line=189 -Flags=00001012 diff --git a/2048.dlw b/2048.dlw deleted file mode 100644 index 15327ba..0000000 --- a/2048.dlw +++ /dev/null @@ -1,126 +0,0 @@ -[DLSimWorkSpace] - -[_1] -Type=5 -Order=0 -Top=60 -Left=1965 -Height=8295 -Width=10470 -State=0 -Flags=00000020 -Setting=417:1:2048.c -OptionA=0 - -[_2] -Type=1 -Order=1 -Top=0 -Left=12645 -Height=4665 -Width=5535 -State=0 -Flags=00000001 -OptionA=15 -OptionB=15 - -[_3] -Type=6 -Order=3 -Top=4680 -Left=12720 -Height=6840 -Width=5490 -State=0 -Flags=00000001 -OptionA=0 - -[_4] -Type=7 -Order=5 -Top=8400 -Left=2040 -Height=4815 -Width=5145 -State=0 -Flags=00000000 -OptionA=0 - -[_5] -Type=8 -Order=4 -Top=8400 -Left=7200 -Height=4845 -Width=5475 -State=0 -Flags=00000000 -OptionA=0 - -[_6] -Type=3 -Order=10 -Top=0 -Left=10788 -Height=6348 -Width=2232 -State=16 -Flags=00000000 -OptionA=0 - -[_7] -Type=2 -Order=9 -Top=6495 -Left=7800 -Height=3435 -Width=5130 -State=16 -Flags=00000000 -OptionA=0 - -[_8] -Type=17 -Order=7 -Top=30 -Left=30 -Height=13200 -Width=1965 -State=0 -Flags=00000000 -OptionA=0 - -[_9] -Type=15 -Order=2 -Top=0 -Left=2010 -Height=11580 -Width=10740 -State=0 -Flags=00000000 -OptionA=0 - -[_32] -Type=16 -Order=6 -Top=15 -Left=1995 -Height=10095 -Width=10710 -State=0 -Flags=00000020 -Setting=412:1:2048.c -OptionA=0 - -[_33] -Type=16 -Order=8 -Top=990 -Left=990 -Height=9060 -Width=13635 -State=16 -Flags=00000020 -Setting=1:1:MonochromeLib.c -OptionA=0