Mercurial > repos > blastem
comparison blastem.c @ 1842:49f65d240299 mame_interp
Merge from default
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sun, 14 Apr 2019 23:38:02 -0700 |
parents | 0a26f3657295 7f4fac75b484 |
children | 374a5ae694e8 |
comparison
equal
deleted
inserted
replaced
1787:0c6d07f91346 | 1842:49f65d240299 |
---|---|
32 #include "zip.h" | 32 #include "zip.h" |
33 #ifndef DISABLE_NUKLEAR | 33 #ifndef DISABLE_NUKLEAR |
34 #include "nuklear_ui/blastem_nuklear.h" | 34 #include "nuklear_ui/blastem_nuklear.h" |
35 #endif | 35 #endif |
36 | 36 |
37 #define BLASTEM_VERSION "0.6.2-pre" | 37 #define BLASTEM_VERSION "0.6.3-pre" |
38 | 38 |
39 #ifdef __ANDROID__ | 39 #ifdef __ANDROID__ |
40 #define FULLSCREEN_DEFAULT 1 | 40 #define FULLSCREEN_DEFAULT 1 |
41 #else | 41 #else |
42 #define FULLSCREEN_DEFAULT 0 | 42 #define FULLSCREEN_DEFAULT 0 |
152 size_t out_size = nearest_pow2(z->entries[i].size); | 152 size_t out_size = nearest_pow2(z->entries[i].size); |
153 *dst = zip_read(z, i, &out_size); | 153 *dst = zip_read(z, i, &out_size); |
154 if (*dst) { | 154 if (*dst) { |
155 if (is_smd_format(z->entries[i].name, *dst)) { | 155 if (is_smd_format(z->entries[i].name, *dst)) { |
156 size_t offset; | 156 size_t offset; |
157 for (offset = 0; offset + SMD_BLOCK_SIZE + SMD_HEADER_SIZE < out_size; offset += SMD_BLOCK_SIZE) | 157 for (offset = 0; offset + SMD_BLOCK_SIZE + SMD_HEADER_SIZE <= out_size; offset += SMD_BLOCK_SIZE) |
158 { | 158 { |
159 uint8_t tmp[SMD_BLOCK_SIZE]; | 159 uint8_t tmp[SMD_BLOCK_SIZE]; |
160 memcpy(tmp, *dst + offset + SMD_HEADER_SIZE, SMD_BLOCK_SIZE); | 160 memcpy(tmp, *dst + offset + SMD_HEADER_SIZE, SMD_BLOCK_SIZE); |
161 process_smd_block(*dst + offset, tmp, SMD_BLOCK_SIZE); | 161 process_smd_block(*dst + offset, tmp, SMD_BLOCK_SIZE); |
162 } | 162 } |