Merge branch 'ai_cleanup' of github.com:OpenXRay/xray-16 into ai_cleanup

Author: nitrocaster

src/xrCore/Crypto/xr_dsa_signer.cpp

@@ -42,13 +42,10 @@ shared_str const xr_dsa_signer::sign_mt(u8 const * data,
 	return m_dsa.sign		(m_private_key, m_sha.pointer(), m_sha.digest_length);
 }
 
-char const * current_time(string64 & dest_time)
+char *current_time(string64 &dest_time)
 {
-	time_t		tmp_curr_time;
-	
-	dest_time[0]	= 0;
-	_time64			(&tmp_curr_time);
-	tm* tmp_tm		= _localtime64(&tmp_curr_time);
+	const time_t tmp_curr_time = std::time(nullptr);
+	tm *tmp_tm = std::localtime(&tmp_curr_time);
 
 	xr_sprintf(dest_time, sizeof(dest_time),
 		"%02d.%02d.%d_%02d:%02d:%02d",

src/xrCore/Crypto/xr_dsa_signer.h

@@ -28,6 +28,6 @@ class XRCORE_API xr_dsa_signer
 
 }; //xr_dsa_signer
 
-XRCORE_API char const * current_time(string64 & dest_time);
+XRCORE_API char *current_time(string64 &dest_time);
 
-#endif //#ifndef XR_DSA_SIGNER_INCLUDED
+#endif //#ifndef XR_DSA_SIGNER_INCLUDED

src/xrCore/Threading/Lock.hpp

@@ -20,9 +20,9 @@ class XRCORE_API Lock
 {
 public:
 #ifdef CONFIG_PROFILE_LOCKS
-    Lock(const char *id) : isLocked(false), id(id) {}
+    Lock(const char *id) : lockCounter(0), id(id) {}
 #else
-    Lock() : isLocked(false) {}
+    Lock() : lockCounter(0) {}
 #endif
 
     Lock(const Lock &) = delete;
@@ -34,29 +34,29 @@ class XRCORE_API Lock
     void Enter()
     {
         mutex.lock();
-        isLocked = true;
+        lockCounter++;
     }
 #endif
 
     bool TryEnter()
     {
         bool locked = mutex.try_lock();
         if (locked)
-            isLocked = true;
+            lockCounter++;
         return locked;
     }
 
     void Leave()
     {
         mutex.unlock();
-        isLocked = false;
+        lockCounter--;
     }
 
-    bool IsLocked() const { return isLocked; }
+    bool IsLocked() const { return lockCounter; }
 
 private:
     std::recursive_mutex mutex;
-    std::atomic_bool isLocked;
+    std::atomic_int lockCounter;
 #ifdef CONFIG_PROFILE_LOCKS
     const char *id;
 #endif

src/xrCore/xrstring.cpp

@@ -6,7 +6,6 @@
 #include "FS_impl.h"
 
 XRCORE_API extern str_container* g_pStringContainer = NULL;
-#define HEADER 16 // ref + len + crc + next
 
 #if 1
 
@@ -153,7 +152,7 @@ str_value* str_container::dock(str_c value)
     // calc len
     u32 s_len = xr_strlen(value);
     u32 s_len_with_zero = (u32)s_len + 1;
-    VERIFY(HEADER + s_len_with_zero < 4096);
+    VERIFY(sizeof(str_value) + s_len_with_zero < 4096);
 
     // setup find structure
     char header[sizeof(str_value)];
@@ -177,7 +176,7 @@ str_value* str_container::dock(str_c value)
        )
     {
 
-        result = (str_value*)Memory.mem_alloc(HEADER + s_len_with_zero
+        result = (str_value*)Memory.mem_alloc(sizeof(str_value) + s_len_with_zero
 #ifdef DEBUG_MEMORY_NAME
                                               , "storage: sstring"
 #endif // DEBUG_MEMORY_NAME
@@ -294,7 +293,7 @@ str_value* str_container::dock(str_c value)
     // calc len
     u32 s_len = xr_strlen(value);
     u32 s_len_with_zero = (u32)s_len + 1;
-    VERIFY(HEADER + s_len_with_zero < 4096);
+    VERIFY(sizeof(str_value) + s_len_with_zero < 4096);
 
     // setup find structure
     char header[sizeof(str_value)];
@@ -328,7 +327,7 @@ str_value* str_container::dock(str_c value)
         // Insert string
         // DUMP_PHASE;
 
-        result = (str_value*)Memory.mem_alloc(HEADER + s_len_with_zero
+        result = (str_value*)Memory.mem_alloc(sizeof(str_value) + s_len_with_zero
 #ifdef DEBUG_MEMORY_NAME
                                               , "storage: sstring"
 #endif // DEBUG_MEMORY_NAME
@@ -423,7 +422,7 @@ u32 str_container::stat_economy()
     const int node_size = 20;
     for (; it != end; it++)
     {
-        counter -= HEADER;
+        counter -= sizeof(str_value);
         counter -= node_size;
         counter += int((int((*it)->dwReference) - 1)*int((*it)->dwLength + 1));
     }

src/xrEngine/xrLoadSurface.cpp

@@ -87,10 +87,10 @@ void Surface_Init()
 BOOL Surface_Detect(string_path& F, LPSTR N)
 {
     FS.update_path(F, "$game_textures$", strconcat(sizeof(F), F, N, ".dds"));
-    int h = _open(F, O_RDONLY | O_BINARY);
-    if (h > 0)
+    FILE *file = fopen(F, "rb");
+    if (file)
     {
-        _close(h);
+        fclose(file);
         return (TRUE);
     }