summaryrefslogtreecommitdiff
path: root/apps/plugins/puzzles/rbmalloc.c
diff options
context:
space:
mode:
authorFranklin Wei <git@fwei.tk>2017-11-21 19:28:16 -0500
committerFranklin Wei <git@fwei.tk>2017-11-21 19:29:45 -0500
commite8e85c5762da65ef7fa6e49ee8cc61f132be6d34 (patch)
tree1fb2c9724e61d121fe0b4460e3e626908f94fcea /apps/plugins/puzzles/rbmalloc.c
parentf4c42213062170ddfcc706b3c5ed19f47517c253 (diff)
downloadrockbox-e8e85c5762da65ef7fa6e49ee8cc61f132be6d34.tar.gz
rockbox-e8e85c5762da65ef7fa6e49ee8cc61f132be6d34.zip
puzzles: resync with upstream; add Loopy and Palisade, mouse mode
This brings a various small changes to the drawing and input code, as well as a brand new "mouse mode", where input goes to a virtual mouse cursor. Only Loopy has this mouse mode enabled by default, while other games have it hidden away under the debug menu. Some changes by me to Palisade were required to make it playable; those are included here as well. Right now, sgt-net is pushing the c200v2's upper limit on size and may have to be dropped in a future commit. Change-Id: I495d2a2125462c2985aec1ffbc54bbe3fe5133bd
Diffstat (limited to 'apps/plugins/puzzles/rbmalloc.c')
-rw-r--r--apps/plugins/puzzles/rbmalloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/puzzles/rbmalloc.c b/apps/plugins/puzzles/rbmalloc.c
index 1cb903ef4f..4baca79c3d 100644
--- a/apps/plugins/puzzles/rbmalloc.c
+++ b/apps/plugins/puzzles/rbmalloc.c
@@ -51,7 +51,7 @@ static bool grab_audiobuf(void)
51void *smalloc(size_t size) { 51void *smalloc(size_t size) {
52 void *p; 52 void *p;
53 p = malloc(size); 53 p = malloc(size);
54 LOGF("allocs: %d", ++allocs); 54 //LOGF("allocs: %d", ++allocs);
55 if (!p) 55 if (!p)
56 { 56 {
57 if(grab_audiobuf()) 57 if(grab_audiobuf())
@@ -67,7 +67,7 @@ void *smalloc(size_t size) {
67void sfree(void *p) { 67void sfree(void *p) {
68 if (p) { 68 if (p) {
69 ++frees; 69 ++frees;
70 LOGF("frees: %d, total outstanding: %d", frees, allocs - frees); 70 //LOGF("frees: %d, total outstanding: %d", frees, allocs - frees);
71 free(p); 71 free(p);
72 } 72 }
73} 73}
@@ -80,7 +80,7 @@ void *srealloc(void *p, size_t size) {
80 if (p) { 80 if (p) {
81 q = realloc(p, size); 81 q = realloc(p, size);
82 } else { 82 } else {
83 LOGF("allocs: %d", ++allocs); 83 //LOGF("allocs: %d", ++allocs);
84 q = malloc(size); 84 q = malloc(size);
85 } 85 }
86 if (!q) 86 if (!q)