aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBad Diode <bd@badd10de.dev>2021-05-23 23:59:43 +0200
committerBad Diode <bd@badd10de.dev>2021-05-23 23:59:43 +0200
commitf4d0f4f9e3563644129e672081c97c589103cf5a (patch)
tree3ee06a137b33e7f0e346271a5e38ed097e915c02 /src
parent596ef772d75b6ec50f196c1f9288d3dc5391b8d6 (diff)
downloaduxngba-f4d0f4f9e3563644129e672081c97c589103cf5a.tar.gz
uxngba-f4d0f4f9e3563644129e672081c97c589103cf5a.zip
Fix warnings and compilation issues on macOS
Diffstat (limited to 'src')
-rw-r--r--src/filesystem.c2
-rw-r--r--src/uxn/devices/ppu.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/filesystem.c b/src/filesystem.c
index 5732e40..6737386 100644
--- a/src/filesystem.c
+++ b/src/filesystem.c
@@ -55,7 +55,7 @@ fs_init() {
55 // Initialize filesystem. 55 // Initialize filesystem.
56 filesystem.num_files = 0; 56 filesystem.num_files = 0;
57 filesystem.data_size = 0; 57 filesystem.data_size = 0;
58 filesystem.data_capacity = 27 * FILE_MAX_SIZE; 58 filesystem.data_capacity = (u16)(FILE_CAPACITY * FILE_MAX_SIZE);
59 memset(&filesystem.files, 0, FILE_CAPACITY * sizeof(File)); 59 memset(&filesystem.files, 0, FILE_CAPACITY * sizeof(File));
60 _fs_write(&filesystem, FILE_HEADER_OFFSET, offsetof(FileSystem, files)); 60 _fs_write(&filesystem, FILE_HEADER_OFFSET, offsetof(FileSystem, files));
61 } else { 61 } else {
diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index e453726..7a4429c 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -329,11 +329,11 @@ toggle_keyboard(void) {
329} 329}
330 330
331void 331void
332update_cursor(int pos) { 332update_cursor(u8 pos) {
333 cursor_position = CLAMP(pos, 0, LEN(keyboard) - 1); 333 cursor_position = CLAMP(pos, 0, LEN(keyboard) - 1);
334 OBJ_ATTR_0(127) = OBJ_ATTR_0(127) & ~0xFF 334 OBJ_ATTR_0(127) = (OBJ_ATTR_0(127) & ~0xFF)
335 | OBJ_Y_COORD(keyboard[cursor_position].y); 335 | OBJ_Y_COORD(keyboard[cursor_position].y);
336 OBJ_ATTR_1(127) = OBJ_ATTR_0(127) & ~0x1FF 336 OBJ_ATTR_1(127) = (OBJ_ATTR_0(127) & ~0x1FF)
337 | OBJ_X_COORD(keyboard[cursor_position].x); 337 | OBJ_X_COORD(keyboard[cursor_position].x);
338} 338}
339 339
@@ -403,7 +403,7 @@ initppu(Ppu *p, u8 hor, u8 ver, u8 pad) {
403 keyboard[i].y = tile_y * 8; 403 keyboard[i].y = tile_y * 8;
404 OBJ_ATTR_0(i) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[i].y); 404 OBJ_ATTR_0(i) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[i].y);
405 OBJ_ATTR_1(i) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[i].x); 405 OBJ_ATTR_1(i) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[i].x);
406 OBJ_ATTR_2(i) = SPRITE_START_IDX + keyboard[i].symbol | OBJ_PAL_BANK(0); 406 OBJ_ATTR_2(i) = (SPRITE_START_IDX + keyboard[i].symbol) | OBJ_PAL_BANK(0);
407 tile_x++; 407 tile_x++;
408 if (tile_x - KEYBOARD_START_TILE_X >= KEYBOARD_ROW_SIZE) { 408 if (tile_x - KEYBOARD_START_TILE_X >= KEYBOARD_ROW_SIZE) {
409 tile_x = KEYBOARD_START_TILE_X; 409 tile_x = KEYBOARD_START_TILE_X;
@@ -412,7 +412,7 @@ initppu(Ppu *p, u8 hor, u8 ver, u8 pad) {
412 } 412 }
413 OBJ_ATTR_0(127) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[cursor_position].y); 413 OBJ_ATTR_0(127) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[cursor_position].y);
414 OBJ_ATTR_1(127) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[cursor_position].x); 414 OBJ_ATTR_1(127) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[cursor_position].x);
415 OBJ_ATTR_2(127) = SPRITE_START_IDX + 0xdb | OBJ_PAL_BANK(3); 415 OBJ_ATTR_2(127) = (SPRITE_START_IDX + 0xdb) | OBJ_PAL_BANK(3);
416 416
417 return 1; 417 return 1;
418} 418}