From dd2f882bc2a366dfac30a079a892ff848b2cc32a Mon Sep 17 00:00:00 2001
From: Alexander Batalov <alex.batalov@gmail.com>
Date: Sat, 18 Jun 2022 17:44:17 +0300
Subject: [PATCH] Cleanup light.h

---
 src/light.cc | 8 ++++++--
 src/light.h  | 8 --------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/light.cc b/src/light.cc
index 7bc2d1a..2255743 100644
--- a/src/light.cc
+++ b/src/light.cc
@@ -1,17 +1,21 @@
 #include "light.h"
 
+#include "map_defs.h"
 #include "perk.h"
 #include "tile.h"
 #include "object.h"
 
 #include <math.h>
 
+// 20% of max light per "Night Vision" rank
+#define LIGHT_LEVEL_NIGHT_VISION_BONUS (65536 / 5)
+
 // 0x51923C
-int gLightLevel = LIGHT_LEVEL_MAX;
+static int gLightLevel = LIGHT_LEVEL_MAX;
 
 // light intensity per elevation per tile
 // 0x59E994
-int gLightIntensity[ELEVATION_COUNT][HEX_GRID_SIZE];
+static int gLightIntensity[ELEVATION_COUNT][HEX_GRID_SIZE];
 
 // 0x47A8F0
 int lightInit()
diff --git a/src/light.h b/src/light.h
index 3f84d62..253beb7 100644
--- a/src/light.h
+++ b/src/light.h
@@ -1,19 +1,11 @@
 #ifndef LIGHT_H
 #define LIGHT_H
 
-#include "map_defs.h"
-
 #define LIGHT_LEVEL_MIN (65536 / 4)
 #define LIGHT_LEVEL_MAX 65536
 
-// 20% of max light per "Night Vision" rank
-#define LIGHT_LEVEL_NIGHT_VISION_BONUS (65536 / 5)
-
 typedef void AdjustLightIntensityProc(int elevation, int tile, int intensity);
 
-extern int gLightLevel;
-extern int gLightIntensity[ELEVATION_COUNT][HEX_GRID_SIZE];
-
 int lightInit();
 int lightGetLightLevel();
 void lightSetLightLevel(int lightLevel, bool shouldUpdateScreen);