| ... | ... |
@@ -108,17 +108,17 @@ screen_clear(UxnScreen *p, Layer *layer) |
| 108 | 108 |
} |
| 109 | 109 |
|
| 110 | 110 |
void |
| 111 |
-screen_redraw(UxnScreen *p, Uint32 *pixels) |
|
| 111 |
+screen_redraw(UxnScreen *p) |
|
| 112 | 112 |
{
|
| 113 | 113 |
Uint32 i, size = p->width * p->height, palette[16]; |
| 114 | 114 |
for(i = 0; i < 16; i++) |
| 115 | 115 |
palette[i] = p->palette[(i >> 2) ? (i >> 2) : (i & 3)]; |
| 116 | 116 |
if(p->mono) {
|
| 117 | 117 |
for(i = 0; i < size; i++) |
| 118 |
- pixels[i] = palette_mono[(p->fg.pixels[i] ? p->fg.pixels[i] : p->bg.pixels[i]) & 0x1]; |
|
| 118 |
+ p->pixels[i] = palette_mono[(p->fg.pixels[i] ? p->fg.pixels[i] : p->bg.pixels[i]) & 0x1]; |
|
| 119 | 119 |
} else {
|
| 120 | 120 |
for(i = 0; i < size; i++) |
| 121 |
- pixels[i] = palette[p->fg.pixels[i] << 2 | p->bg.pixels[i]]; |
|
| 121 |
+ p->pixels[i] = palette[p->fg.pixels[i] << 2 | p->bg.pixels[i]]; |
|
| 122 | 122 |
} |
| 123 | 123 |
p->fg.changed = p->bg.changed = 0; |
| 124 | 124 |
} |
| ... | ... |
@@ -130,10 +130,10 @@ clamp(int val, int min, int max) |
| 130 | 130 |
} |
| 131 | 131 |
|
| 132 | 132 |
void |
| 133 |
-screen_mono(UxnScreen *p, Uint32 *pixels) |
|
| 133 |
+screen_mono(UxnScreen *p) |
|
| 134 | 134 |
{
|
| 135 | 135 |
p->mono = !p->mono; |
| 136 |
- screen_redraw(p, pixels); |
|
| 136 |
+ screen_redraw(p); |
|
| 137 | 137 |
} |
| 138 | 138 |
|
| 139 | 139 |
/* IO */ |
| ... | ... |
@@ -28,8 +28,8 @@ extern UxnScreen uxn_screen; |
| 28 | 28 |
void screen_palette(UxnScreen *p, Uint8 *addr); |
| 29 | 29 |
void screen_resize(UxnScreen *p, Uint16 width, Uint16 height); |
| 30 | 30 |
void screen_clear(UxnScreen *p, Layer *layer); |
| 31 |
-void screen_redraw(UxnScreen *p, Uint32 *pixels); |
|
| 32 |
-void screen_mono(UxnScreen *p, Uint32 *pixels); |
|
| 31 |
+void screen_redraw(UxnScreen *p); |
|
| 32 |
+void screen_mono(UxnScreen *p); |
|
| 33 | 33 |
|
| 34 | 34 |
Uint8 screen_dei(Uxn *u, Uint8 addr); |
| 35 | 35 |
void screen_deo(Uint8 *ram, Uint8 *d, Uint8 port); |
| ... | ... |
@@ -220,7 +220,7 @@ static void |
| 220 | 220 |
redraw(void) |
| 221 | 221 |
{
|
| 222 | 222 |
if(gRect.w != uxn_screen.width || gRect.h != uxn_screen.height) set_size(); |
| 223 |
- screen_redraw(&uxn_screen, uxn_screen.pixels); |
|
| 223 |
+ screen_redraw(&uxn_screen); |
|
| 224 | 224 |
if(SDL_UpdateTexture(gTexture, NULL, uxn_screen.pixels, uxn_screen.width * sizeof(Uint32)) != 0) |
| 225 | 225 |
error("SDL_UpdateTexture", SDL_GetError());
|
| 226 | 226 |
SDL_RenderClear(gRenderer); |
| ... | ... |
@@ -376,7 +376,7 @@ do_shortcut(Uxn *u, SDL_Event *event) |
| 376 | 376 |
else if(event->key.keysym.sym == SDLK_F4) |
| 377 | 377 |
restart(u); |
| 378 | 378 |
else if(event->key.keysym.sym == SDLK_F5) {
|
| 379 |
- screen_mono(&uxn_screen, uxn_screen.pixels); |
|
| 379 |
+ screen_mono(&uxn_screen); |
|
| 380 | 380 |
redraw(); |
| 381 | 381 |
} |
| 382 | 382 |
} |