From ccbfaa3a86cca7e2f31ce99869e6555c6a3924c9 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 14 Nov 2023 22:57:27 +0300
Subject: [PATCH] Fog factor correction, small fixes

---
 CMakeLists.txt          | 2 +-
 src/engine.cpp          | 2 +-
 src/util/stringutil.cpp | 8 ++++----
 src/util/stringutil.h   | 4 ++--
 src/voxel_engine.cpp    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e96a8c98..1bef1499 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ else()
   target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -lstdc++fs
     # additional warnings
     -Wformat-nonliteral -Wcast-align 
-    -Wpointer-arith -Winline -Wundef
+    -Wpointer-arith -Wundef
     -Wwrite-strings -Wno-unused-parameter)
 endif()
 
diff --git a/src/engine.cpp b/src/engine.cpp
index 4f83b563..8aaa2c5b 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -115,7 +115,7 @@ void Engine::mainloop() {
 		level->update();
 		level->chunksController->update(settings.chunks.loadSpeed);
 
-		float fovFactor = 16.0f / (float)settings.chunks.loadDistance;
+		float fovFactor = 18.0f / (float)settings.chunks.loadDistance;
 		worldRenderer.draw(camera, occlusion, fovFactor, settings.fogCurve);
 		hud.draw();
 		if (level->player->debug) {
diff --git a/src/util/stringutil.cpp b/src/util/stringutil.cpp
index 1ff19353..24c716c4 100644
--- a/src/util/stringutil.cpp
+++ b/src/util/stringutil.cpp
@@ -10,25 +10,25 @@ using std::stringstream;
 using std::wstring;
 using std::wstringstream;
 
-wstring lfill(wstring s, int length, wchar_t c) {
+wstring lfill(wstring s, uint length, wchar_t c) {
     if (s.length() >= length) {
         return s;
     }
     wstringstream ss;
-    for (int i = 0; i < length-s.length(); i++) {
+    for (uint i = 0; i < length-s.length(); i++) {
         ss << c;
     }
     ss << s;
     return ss.str();
 }
 
-wstring rfill(wstring s, int length, wchar_t c) {
+wstring rfill(wstring s, uint length, wchar_t c) {
     if (s.length() >= length) {
         return s;
     }
     wstringstream ss;
     ss << s;
-    for (int i = 0; i < length-s.length(); i++) {
+    for (uint i = 0; i < length-s.length(); i++) {
         ss << c;
     }
     return ss.str();
diff --git a/src/util/stringutil.h b/src/util/stringutil.h
index 2b5dae21..9969bc41 100644
--- a/src/util/stringutil.h
+++ b/src/util/stringutil.h
@@ -4,8 +4,8 @@
 #include <string>
 #include "../typedefs.h"
 
-extern std::wstring lfill(std::wstring s, int length, wchar_t c);
-extern std::wstring rfill(std::wstring s, int length, wchar_t c);
+extern std::wstring lfill(std::wstring s, uint length, wchar_t c);
+extern std::wstring rfill(std::wstring s, uint length, wchar_t c);
 
 extern uint encode_utf8(uint c, ubyte* bytes);
 extern std::string wstr2str_utf8(const std::wstring ws);
diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp
index 036d01d0..ceed45b3 100644
--- a/src/voxel_engine.cpp
+++ b/src/voxel_engine.cpp
@@ -13,7 +13,7 @@
 #include "coders/toml.h"
 #include "files/files.h"
 
-inline toml::Wrapper create_wrapper(EngineSettings& settings) {
+toml::Wrapper create_wrapper(EngineSettings& settings) {
 	toml::Wrapper wrapper;
 	toml::Section& display = wrapper.add("display");
 	display.add("width", &settings.display.width);