Skip to content

Commit 0b24d96

Browse files
Xottab-DUTYXottab-DUTY
committed
Revert "Added xrUICore project. Some ui files moved to xrUICore"
This reverts commit 94acc9a.
1 parent 23ba42b commit 0b24d96

File tree

457 files changed

+4313
-4850
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

457 files changed

+4313
-4850
lines changed

‎res/gamedata/configs/localization.ltx

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/Common/CommonImportExport.inl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@
7272
#define XRSOUND_API XR_IMPORT
7373
#endif
7474

75-
#ifdef XRUICORE_EXPORTS
76-
#define XRUICORE_API XR_EXPORT
77-
#else
78-
#define XRUICORE_API XR_IMPORT
79-
#endif
80-
8175
#ifndef ENGINE_API
8276
#ifndef NO_ENGINE_API
8377
#ifdef ENGINE_BUILD

‎src/Include/xrAPI/xrAPI.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ class CRender;
1111
class CScriptEngine;
1212
class AISpaceBase;
1313
class ISoundManager;
14-
class ui_core;
1514

1615
class XRAPI_API EngineGlobalEnvironment
1716
{
@@ -28,7 +27,6 @@ class XRAPI_API EngineGlobalEnvironment
2827
CScriptEngine* ScriptEngine;
2928
AISpaceBase* AISpace;
3029
ISoundManager* Sound;
31-
ui_core* UI;
3230

3331
bool isEditor;
3432
bool isDedicatedServer;

‎src/engine.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrECore", "editors\xrECore\
248248
EndProject
249249
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrEditor", "editors\xrEditor\xrEditor.vcxproj", "{BE4B23E7-2CA8-4607-A473-116C4242F23D}"
250250
EndProject
251-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrUICore", "xrUICore\xrUICore.vcxproj", "{37B3642C-B706-4C93-BC54-BADADC8FC9B1}"
252-
EndProject
253251
Global
254252
GlobalSection(SolutionConfigurationPlatforms) = preSolution
255253
Debug|x64 = Debug|x64
@@ -1127,18 +1125,6 @@ Global
11271125
{BE4B23E7-2CA8-4607-A473-116C4242F23D}.Release|x64.Build.0 = Release|x64
11281126
{BE4B23E7-2CA8-4607-A473-116C4242F23D}.Release|x86.ActiveCfg = Release|Win32
11291127
{BE4B23E7-2CA8-4607-A473-116C4242F23D}.Release|x86.Build.0 = Release|Win32
1130-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Debug|x64.ActiveCfg = Debug|x64
1131-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Debug|x64.Build.0 = Debug|x64
1132-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Debug|x86.ActiveCfg = Debug|Win32
1133-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Debug|x86.Build.0 = Debug|Win32
1134-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Mixed|x64.ActiveCfg = Mixed|x64
1135-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Mixed|x64.Build.0 = Mixed|x64
1136-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Mixed|x86.ActiveCfg = Mixed|Win32
1137-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Mixed|x86.Build.0 = Mixed|Win32
1138-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Release|x64.ActiveCfg = Release|x64
1139-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Release|x64.Build.0 = Release|x64
1140-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Release|x86.ActiveCfg = Release|Win32
1141-
{37B3642C-B706-4C93-BC54-BADADC8FC9B1}.Release|x86.Build.0 = Release|Win32
11421128
EndGlobalSection
11431129
GlobalSection(SolutionProperties) = preSolution
11441130
HideSolutionNode = FALSE

‎src/utils/xrSE_Factory/xrUIXmlParser.cpp

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,59 @@ shared_str CUIXml::correct_file_name(pcstr path, pcstr fn)
1414
return fn;
1515
}
1616

17+
//#define LOG_ALL_XMLS
18+
#ifdef LOG_ALL_XMLS
19+
int ListXmlCount = 0;
20+
struct DBGList_
21+
{
22+
int num;
23+
bool closed;
24+
};
25+
xr_vector<DBGList_> dbg_list_xmls;
26+
void dump_list_xmls()
27+
{
28+
Msg("------Total xmls %d", dbg_list_xmls.size());
29+
xr_vector<DBGList_>::iterator _it = dbg_list_xmls.begin();
30+
for (; _it != dbg_list_xmls.end(); ++_it)
31+
if (!(*_it).closed)
32+
Msg("--leak detected ---- xml = %d", (*_it).num);
33+
}
34+
#else
35+
void dump_list_xmls() {}
36+
#endif
37+
1738
CUIXml::CUIXml()
1839
{
40+
#ifdef LOG_ALL_XMLS
41+
ListXmlCount++;
42+
m_dbg_id = ListXmlCount;
43+
dbg_list_xmls.push_back(DBGList_());
44+
dbg_list_xmls.back().num = m_dbg_id;
45+
dbg_list_xmls.back().closed = false;
46+
#endif
1947
}
2048

2149
CUIXml::~CUIXml()
22-
{}
50+
{
51+
#ifdef LOG_ALL_XMLS
52+
xr_vector<DBGList_>::iterator _it = dbg_list_xmls.begin();
53+
bool bOK = false;
54+
for (; _it != dbg_list_xmls.end(); ++_it)
55+
{
56+
if ((*_it).num == m_dbg_id && !(*_it).closed)
57+
{
58+
bOK = true;
59+
(*_it).closed = true;
60+
dbg_list_xmls.erase(_it);
61+
break;
62+
}
63+
if ((*_it).num == m_dbg_id && (*_it).closed)
64+
{
65+
Msg("--XML [%d] already deleted", m_dbg_id);
66+
bOK = true;
67+
}
68+
}
69+
if (!bOK)
70+
Msg("CUIXml::~CUIXml.[%d] cannot find xml in list", m_dbg_id);
71+
#endif
72+
}

‎src/xrEngine/StringTable/IStringTable.cpp

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/xrEngine/StringTable/IStringTable.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/xrEngine/xrEngine.vcxproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,6 @@
263263
<ClInclude Include="Stats.h" />
264264
<ClInclude Include="stdafx.h" />
265265
<ClInclude Include="std_classes.h" />
266-
<ClInclude Include="StringTable\IStringTable.h" />
267-
<ClInclude Include="StringTable\IStringTableDefs.h" />
268266
<ClInclude Include="Text_Console.h" />
269267
<ClInclude Include="thunderbolt.h" />
270268
<ClInclude Include="tntQAVI.h" />
@@ -280,7 +278,6 @@
280278
<ClInclude Include="xr_collide_form.h" />
281279
<ClInclude Include="xr_efflensflare.h" />
282280
<ClInclude Include="xr_input.h" />
283-
<ClInclude Include="xr_input_xinput.h" />
284281
<ClInclude Include="XR_IOConsole.h" />
285282
<ClInclude Include="xr_ioc_cmd.h" />
286283
<ClInclude Include="xr_object.h" />
@@ -375,7 +372,6 @@
375372
<ClCompile Include="stdafx.cpp">
376373
<PrecompiledHeader>Create</PrecompiledHeader>
377374
</ClCompile>
378-
<ClCompile Include="StringTable\IStringTable.cpp" />
379375
<ClCompile Include="Text_Console.cpp" />
380376
<ClCompile Include="Text_Console_WndProc.cpp" />
381377
<ClCompile Include="thunderbolt.cpp" />
@@ -389,7 +385,6 @@
389385
<ClCompile Include="xr_collide_form.cpp" />
390386
<ClCompile Include="xr_efflensflare.cpp" />
391387
<ClCompile Include="xr_input.cpp" />
392-
<ClCompile Include="xr_input_xinput.cpp" />
393388
<ClCompile Include="XR_IOConsole.cpp" />
394389
<ClCompile Include="XR_IOConsole_callback.cpp" />
395390
<ClCompile Include="XR_IOConsole_control.cpp" />

‎src/xrEngine/xrEngine.vcxproj.filters

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@
232232
<Filter Include="Rendering Device">
233233
<UniqueIdentifier>{e4d34774-3a5b-468f-9400-12c702636fa1}</UniqueIdentifier>
234234
</Filter>
235-
<Filter Include="Game API\StringTable">
236-
<UniqueIdentifier>{948b4643-0f42-4027-ac44-dbe3702887f4}</UniqueIdentifier>
237-
</Filter>
238235
</ItemGroup>
239236
<ItemGroup>
240237
<ClInclude Include="defines.h">
@@ -567,15 +564,6 @@
567564
<ClInclude Include="Stats.h">
568565
<Filter>Rendering Device</Filter>
569566
</ClInclude>
570-
<ClInclude Include="xr_input_xinput.h">
571-
<Filter>Interfaces\Input</Filter>
572-
</ClInclude>
573-
<ClInclude Include="StringTable\IStringTable.h">
574-
<Filter>Game API\StringTable</Filter>
575-
</ClInclude>
576-
<ClInclude Include="StringTable\IStringTableDefs.h">
577-
<Filter>Game API\StringTable</Filter>
578-
</ClInclude>
579567
</ItemGroup>
580568
<ItemGroup>
581569
<ClCompile Include="defines.cpp">
@@ -893,12 +881,6 @@
893881
<ClCompile Include="Stats.cpp">
894882
<Filter>Rendering Device</Filter>
895883
</ClCompile>
896-
<ClCompile Include="xr_input_xinput.cpp">
897-
<Filter>Interfaces\Input</Filter>
898-
</ClCompile>
899-
<ClCompile Include="StringTable\IStringTable.cpp">
900-
<Filter>Game API\StringTable</Filter>
901-
</ClCompile>
902884
</ItemGroup>
903885
<ItemGroup>
904886
<Text Include="ClientServer.txt" />

0 commit comments

Comments
 (0)