From 5754da507d148841c0173a483c2e03c4a7e703e9 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 21 Feb 2019 20:23:24 +0000 Subject: [PATCH] Made gFade static We don't need to leak all this --- src/Fade.cpp | 16 +++++++++++++++- src/Fade.h | 14 -------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Fade.cpp b/src/Fade.cpp index aa479fdb..15f6a874 100644 --- a/src/Fade.cpp +++ b/src/Fade.cpp @@ -2,12 +2,26 @@ #include +#include "CommonDefines.h" #include "WindowsWrapper.h" #include "Draw.h" #include "Game.h" -FADE gFade; +#define FADE_WIDTH (((WINDOW_WIDTH - 1) / 16) + 1) +#define FADE_HEIGHT (((WINDOW_HEIGHT - 1) / 16) + 1) + +struct FADE +{ + int mode; + BOOL bMask; + int count; + char ani_no[FADE_HEIGHT][FADE_WIDTH]; + BOOLEAN flag[FADE_HEIGHT][FADE_WIDTH]; + char dir; +}; + +static FADE gFade; static unsigned long mask_color; void InitFade() diff --git a/src/Fade.h b/src/Fade.h index 44747945..793372e7 100644 --- a/src/Fade.h +++ b/src/Fade.h @@ -1,21 +1,7 @@ #pragma once -#include "CommonDefines.h" #include "WindowsWrapper.h" -#define FADE_WIDTH (((WINDOW_WIDTH - 1) >> 4) + 1) -#define FADE_HEIGHT (((WINDOW_HEIGHT - 1) >> 4) + 1) - -struct FADE -{ - int mode; - BOOL bMask; - int count; - char ani_no[FADE_HEIGHT][FADE_WIDTH]; - BOOLEAN flag[FADE_HEIGHT][FADE_WIDTH]; - char dir; -}; - void InitFade(); void SetFadeMask(); void ClearFade();