walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'dev'

This commit is contained in:
Linus Probert 2018-08-12 10:46:29 +02:00
parent 4ccdebe79c ffd777e055
commit 7739ac546f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.c
View File

@ -632,6 +632,7 @@ run_menu(void)
SDL_RenderClear(gRenderer); SDL_RenderClear(gRenderer);
SDL_RenderSetViewport(gRenderer, &menuViewport); SDL_RenderSetViewport(gRenderer, &menuViewport);
map_render(gMap, gCamera); map_render(gMap, gCamera);
map_render_mid_layer(gMap, gCamera);
map_render_top_layer(gMap, gCamera); map_render_top_layer(gMap, gCamera);
roommatrix_render_lightmap(gRoomMatrix, gCamera); roommatrix_render_lightmap(gRoomMatrix, gCamera);

2
src/screen.c
View File

@ -33,7 +33,7 @@ create_text_sprite(const char *msg, int x, int y, SDL_Renderer *renderer)
{ {
Sprite *s = sprite_create(); Sprite *s = sprite_create();
sprite_load_text_texture(s, "GUI/SDS_8x8.ttf", 0, 14, 1); sprite_load_text_texture(s, "GUI/SDS_8x8.ttf", 0, 14, 1);
texture_load_from_text(s->textures[0], msg, C_BLUE, C_WHITE, renderer); texture_load_from_text(s->textures[0], msg, C_WHITE, C_BLACK, renderer);
s->pos = (Position) { x, y }; s->pos = (Position) { x, y };
s->fixed = true; s->fixed = true;
s->dim = s->textures[0]->dim; s->dim = s->textures[0]->dim;