Merge pull request server-imp#10 from Evasion3356/ModernizeThread

Modernized everModded thread.

Author: server-imp

cfg.h

@@ -1,8 +1,6 @@
 #pragma once
-#ifndef _CFG
-#define _CFG
 #include "pch.h"
-#include "log.h";
+#include "log.h"
 #include "util.h"
 
 namespace cfg
@@ -314,6 +312,4 @@ namespace cfg
             _properties.push_back(prop);
         }
     };
-}
-
-#endif
+}

log.h

@@ -24,7 +24,7 @@ namespace logging
         fprintf(logfile, "[%s] [%s] %02d:%02d:%02d ", HEADER, tag, local_time->tm_hour, local_time->tm_min, local_time->tm_sec);
 
         va_list args;
-        va_start(args, _fmt);
+        va_start(args, fmt);
 
         vprintf(_fmt, args);
         vfprintf(logfile, _fmt, args);
@@ -49,7 +49,7 @@ namespace logging
             logfile = fopen(LOG_FILE, "w+");
 
         va_list args;
-        va_start(args, _fmt);
+        va_start(args, fmt);
 
         vprintf(_fmt, args);
         vfprintf(logfile, _fmt, args);

memory.h

@@ -239,7 +239,7 @@ namespace memory
                 }
                 else
                 {
-                    bytes.push_back(strtoul(i, &i, 16));
+                    bytes.push_back(static_cast<uint8_t>(strtoul(i, &i, 16)));
                     mask.push_back(1);
                 }
             }
@@ -312,7 +312,9 @@ namespace memory
             }
 
             if (closestMatch)
+            {
                 dbg("Failed to find pattern, closest match is 0x%p [%d/%d]", closestMatch, closestMatchCount, bytes.size());
+            }
 
             return false;
         }
@@ -536,7 +538,7 @@ namespace memory
                 if (pattern::find(pattern.pattern, &pointer, moduleName))
                 {
                     valid = true;
-                    pointer = pointer.add(pattern.offset);
+                    pointer = pointer.add(static_cast<int32_t>(pattern.offset));
                     break;
                 }
             }

sfae.h

@@ -252,26 +252,20 @@ public:\
         if (pointers::everModded.raw())
         {
             // enter an infinite loop to monitor everModded for the duration of game session
-            // should run about 200 times per second
-
+            // should run about 10 times per second
             info("Monitoring \"Ever Modded\"");
-            CreateThread(nullptr, 0, [](PVOID) -> DWORD
+            std::thread([] {
+                auto ptr = pointers::everModded.as<uint8_t*>();
+                while (true)
                 {
-                    auto ptr = pointers::everModded.as<uint8_t*>();
-                    while (true)
+                    if (*ptr != 0)
                     {
-
-                        // if everModded is not 0, change it back to 0
-                        if (*ptr != 0)
-                        {
-                            *ptr = 0;
-
-                            info("Blocked \"Ever Modded\" Change");
-                        }
-
-                        std::this_thread::sleep_for(5ms);
+                        *ptr = 0;
+                        info("Blocked \"Ever Modded\" Change");
                     }
-                }, 0, 0, 0);
+                    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+                }
+            }).detach(); // Detach to allow independent execution
         }
 
         if (settings.getEnableASILoader())

util.h

@@ -105,10 +105,7 @@ namespace util
                 fs::remove(filePath);
                 return true;
             }
-            catch (const std::exception& ex) 
-            {
-                ;
-            }
+            catch (const std::exception&) {}
         }
 
         return false;