From 21bb032a05beaaea61532aa2207cf1419f801c16 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 11 Dec 2018 08:24:25 +0000 Subject: [PATCH] Various graphics fixes. --- src/battle/battle.c | 31 +++++++++++++++++-------------- src/battle/rope.c | 2 +- src/challenges/challengeHome.c | 4 ++-- src/galaxy/galacticMap.c | 2 +- src/game/fighterDatabase.c | 2 +- src/game/stats.c | 2 +- src/game/trophies.c | 6 +++--- src/system/controls.c | 2 +- src/system/draw.c | 2 +- src/system/options.c | 2 +- src/system/widgets.c | 8 ++++---- 11 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/battle/battle.c b/src/battle/battle.c index cdf1dc1..ce908e2 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -273,23 +273,26 @@ static void draw(void) static void drawMenu(void) { SDL_Rect r; + + if (app.modalDialog.type == MD_NONE) + { + SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_BLEND); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 128); + SDL_RenderFillRect(app.renderer, NULL); + SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_NONE); - SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_BLEND); - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 128); - SDL_RenderFillRect(app.renderer, NULL); - SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_NONE); + r.w = 400; + r.h = 400; + r.x = (SCREEN_WIDTH / 2) - r.w / 2; + r.y = (SCREEN_HEIGHT / 2) - r.h / 2; - r.w = 400; - r.h = 400; - r.x = (SCREEN_WIDTH / 2) - r.w / 2; - r.y = (SCREEN_HEIGHT / 2) - r.h / 2; + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); + SDL_RenderFillRect(app.renderer, &r); + SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); + SDL_RenderDrawRect(app.renderer, &r); - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0); - SDL_RenderFillRect(app.renderer, &r); - SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, SDL_ALPHA_OPAQUE); - SDL_RenderDrawRect(app.renderer, &r); - - drawWidgets("inBattle"); + drawWidgets("inBattle"); + } } static void handleKeyboard(void) diff --git a/src/battle/rope.c b/src/battle/rope.c index 1966abf..72d18bc 100644 --- a/src/battle/rope.c +++ b/src/battle/rope.c @@ -90,7 +90,7 @@ void drawRope(Entity *e) { if (e->towing) { - SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); SDL_RenderDrawLine(app.renderer, e->x - battle.camera.x, e->y - battle.camera.y, e->towing->x - battle.camera.x, e->towing->y - battle.camera.y); } diff --git a/src/challenges/challengeHome.c b/src/challenges/challengeHome.c index 6a3e2de..e241260 100644 --- a/src/challenges/challengeHome.c +++ b/src/challenges/challengeHome.c @@ -405,7 +405,7 @@ static void drawChallenges(void) SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 128); SDL_RenderFillRect(app.renderer, &r); SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_NONE); - SDL_SetRenderDrawColor(app.renderer, 64, 64, 64, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 64, 64, 64, 255); SDL_RenderDrawRect(app.renderer, &r); r.y = 240; @@ -453,7 +453,7 @@ static void drawMenu(void) r.x = (SCREEN_WIDTH / 2) - r.w / 2; r.y = (SCREEN_HEIGHT / 2) - r.h / 2; - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &r); SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); SDL_RenderDrawRect(app.renderer, &r); diff --git a/src/galaxy/galacticMap.c b/src/galaxy/galacticMap.c index 99a0a09..2b64a5c 100644 --- a/src/galaxy/galacticMap.c +++ b/src/galaxy/galacticMap.c @@ -812,7 +812,7 @@ static void drawMenu(void) r.x = (SCREEN_WIDTH / 2) - r.w / 2; r.y = (SCREEN_HEIGHT / 2) - r.h / 2; - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &r); SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); SDL_RenderDrawRect(app.renderer, &r); diff --git a/src/game/fighterDatabase.c b/src/game/fighterDatabase.c index c0d819f..d325670 100644 --- a/src/game/fighterDatabase.c +++ b/src/game/fighterDatabase.c @@ -110,7 +110,7 @@ void drawFighterDatabase(void) r.x = (SCREEN_WIDTH / 2) - r.w / 2; r.y = (SCREEN_HEIGHT / 2) - r.h / 2; - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &r); SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); SDL_RenderDrawRect(app.renderer, &r); diff --git a/src/game/stats.c b/src/game/stats.c index 8b662ea..96d6366 100644 --- a/src/game/stats.c +++ b/src/game/stats.c @@ -141,7 +141,7 @@ void drawStats(void) r.x = (SCREEN_WIDTH / 2) - r.w / 2; r.y = (SCREEN_HEIGHT / 2) - r.h / 2; - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &r); SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); SDL_RenderDrawRect(app.renderer, &r); diff --git a/src/game/trophies.c b/src/game/trophies.c index 9f3907a..a72bada 100644 --- a/src/game/trophies.c +++ b/src/game/trophies.c @@ -143,7 +143,7 @@ void drawTrophies(void) r.x = (SCREEN_WIDTH / 2) - r.w / 2; r.y = (SCREEN_HEIGHT / 2) - r.h / 2; - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &r); SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); SDL_RenderDrawRect(app.renderer, &r); @@ -307,10 +307,10 @@ void drawTrophyAlert(void) if (alertTrophy) { - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &alertRect); - SDL_SetRenderDrawColor(app.renderer, 64, 64, 64, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 64, 64, 64, 255); SDL_RenderDrawRect(app.renderer, &alertRect); drawText(alertRect.x + 15, alertRect.y + 5, 30, TA_LEFT, colors.white, alertTrophy->title); diff --git a/src/system/controls.c b/src/system/controls.c index 67c952c..6e44036 100644 --- a/src/system/controls.c +++ b/src/system/controls.c @@ -162,7 +162,7 @@ void drawControls(void) r.x = (SCREEN_WIDTH / 2) - r.w / 2; r.y = (SCREEN_HEIGHT / 2) - r.h / 2; - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &r); SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); SDL_RenderDrawRect(app.renderer, &r); diff --git a/src/system/draw.c b/src/system/draw.c index ddfce0b..2591015 100644 --- a/src/system/draw.c +++ b/src/system/draw.c @@ -63,7 +63,7 @@ static void initColor(SDL_Color *c, int r, int g, int b) void prepareScene(void) { SDL_SetRenderTarget(app.renderer, app.backBuffer); - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderClear(app.renderer); } diff --git a/src/system/options.c b/src/system/options.c index c181f0b..def477b 100644 --- a/src/system/options.c +++ b/src/system/options.c @@ -101,7 +101,7 @@ static void drawMain(void) r.x = (SCREEN_WIDTH / 2) - r.w / 2; r.y = (SCREEN_HEIGHT / 2) - r.h / 2; - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &r); SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255); SDL_RenderDrawRect(app.renderer, &r); diff --git a/src/system/widgets.c b/src/system/widgets.c index 1197587..e42f5f5 100644 --- a/src/system/widgets.c +++ b/src/system/widgets.c @@ -150,19 +150,19 @@ void drawWidgets(const char *group) } else { - SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 255); SDL_RenderFillRect(app.renderer, &w->rect); if (w == selectedWidget) { - SDL_SetRenderDrawColor(app.renderer, 64, 128, 200, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 64, 128, 200, 255); SDL_RenderFillRect(app.renderer, &w->rect); - SDL_SetRenderDrawColor(app.renderer, 128, 192, 255, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 128, 192, 255, 255); SDL_RenderDrawRect(app.renderer, &w->rect); } else { - SDL_SetRenderDrawColor(app.renderer, 64, 64, 64, SDL_ALPHA_OPAQUE); + SDL_SetRenderDrawColor(app.renderer, 64, 64, 64, 255); SDL_RenderDrawRect(app.renderer, &w->rect); } }