Some post-merge fixes

Author: Zegeri

src/xrCore/log.cpp

@@ -44,10 +44,8 @@ void AddOne(const char* split)
 {
     logCS.Enter();
 
-#if defined(DEBUG) || defined(LINUX) || defined(WINDOWS)
     OutputDebugString(split);
     OutputDebugString("\n");
-#endif
 
     LogFile.push_back(split);
 

src/xrEngine/CMakeLists.txt

@@ -2,6 +2,7 @@ project(xrEngine)
 
 list(APPEND DIRS
     "."
+    "StringTable"
     )
 
 add_dir("${DIRS}")

src/xrGame/CMakeLists.txt

@@ -74,6 +74,7 @@ list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIDebu
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIFrags.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIFrags2.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIFrameLine.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListBox_script.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListItem.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListItemAdv.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListItemEx.cpp")

src/xrGame/ui/UIMapList.cpp

@@ -283,7 +283,7 @@ void CUIMapList::SetModeSelector(CUIWindow* ms) { m_pModeSelector = ms; }
 void CUIMapList::SetMapPic(CUIStatic* map_pic) { m_pMapPic = map_pic; }
 void CUIMapList::SetMapInfo(CUIMapInfo* map_info) { m_pMapInfo = map_info; }
 void CUIMapList::SetServerParams(LPCSTR params) { m_srv_params = params; }
-#include "xrUICore/ListBox/UIListBoxItem.h"
+
 void CUIMapList::AddWeather(const shared_str& WeatherType, const shared_str& WeatherTime, u32 _id)
 {
     R_ASSERT2(m_pWeatherSelector, "m_pWeatherSelector == NULL");

src/xrGame/ui/UISleepStatic.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "UISleepStatic.h"
 #include "Actor_Flags.h"
 #include "Level.h"