Skip to content

Commit c55786c

Browse files
author
nitrocaster
committed
Move associative_vector and MbHelpers to xrCore.
1 parent a6e432f commit c55786c

File tree

69 files changed

+662
-848
lines changed

Some content is hidden

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

69 files changed

+662
-848
lines changed

src/utils/mp_configs_verifyer/pch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
#include <stdio.h>
1111
#include <conio.h>
1212
#include "xrServerEntities/object_broker.h"
13-
#include "xrServerEntities/associative_vector.h"
13+
#include "xrCore/Containers/AssociativeVector.hpp"
1414

1515
#endif // #define PCH_H_INCLUDED

src/utils/mp_screenshots_info/pch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
#include <stdio.h>
99
#include <conio.h>
1010
#include "xrServerEntities/object_broker.h"
11-
#include "xrServerEntities/associative_vector.h"
11+
#include "xrCore/Containers/AssociativeVector.hpp"
1212

1313
#endif // #define PCH_H_INCLUDED

src/utils/xrAI/patrol_path_storage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ class CGameLevelCrossTable;
1414
class CGameGraph;
1515

1616
#include "object_interfaces.h"
17-
#include "associative_vector.h"
17+
#include "xrCore/Containers/AssociativeVector.hpp"
1818

1919
class CPatrolPathStorage : public IPureSerializeObject<IReader,IWriter> {
2020
private:
2121
typedef IPureSerializeObject<IReader,IWriter> inherited;
2222

2323
public:
24-
typedef associative_vector<shared_str,CPatrolPath*> PATROL_REGISTRY;
24+
typedef AssociativeVector<shared_str,CPatrolPath*> PATROL_REGISTRY;
2525
typedef PATROL_REGISTRY::iterator iterator;
2626
typedef PATROL_REGISTRY::const_iterator const_iterator;
2727

src/utils/xrSE_Factory/xrSE_Factory.vcxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,6 @@
204204
<ClInclude Include="..\..\xrServerEntities\alife_monster_brain_inline.h" />
205205
<ClInclude Include="..\..\xrServerEntities\alife_movement_manager_holder.h" />
206206
<ClInclude Include="..\..\xrServerEntities\alife_space.h" />
207-
<ClInclude Include="..\..\xrServerEntities\associative_vector.h" />
208-
<ClInclude Include="..\..\xrServerEntities\associative_vector_compare_predicate.h" />
209-
<ClInclude Include="..\..\xrServerEntities\associative_vector_compare_predicate_inline.h" />
210-
<ClInclude Include="..\..\xrServerEntities\associative_vector_inline.h" />
211207
<ClInclude Include="..\..\xrServerEntities\character_info.h" />
212208
<ClInclude Include="..\..\xrServerEntities\character_info_defs.h" />
213209
<ClInclude Include="..\..\xrServerEntities\clsid_game.h" />

src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
<Filter Include="Common\SmartCast">
4141
<UniqueIdentifier>{ea79b7ec-1151-459a-a904-83c9d5bfdd2a}</UniqueIdentifier>
4242
</Filter>
43-
<Filter Include="Common\associative_vector">
44-
<UniqueIdentifier>{d137ef10-7858-429e-9d83-c9adca7a8920}</UniqueIdentifier>
45-
</Filter>
4643
<Filter Include="Scripts">
4744
<UniqueIdentifier>{beab8f12-fdda-4d4c-bff0-faf824bb05d7}</UniqueIdentifier>
4845
</Filter>
@@ -276,18 +273,6 @@
276273
<ClInclude Include="..\..\xrServerEntities\smart_cast_impl2.h">
277274
<Filter>Common\SmartCast</Filter>
278275
</ClInclude>
279-
<ClInclude Include="..\..\xrServerEntities\associative_vector.h">
280-
<Filter>Common\associative_vector</Filter>
281-
</ClInclude>
282-
<ClInclude Include="..\..\xrServerEntities\associative_vector_compare_predicate.h">
283-
<Filter>Common\associative_vector</Filter>
284-
</ClInclude>
285-
<ClInclude Include="..\..\xrServerEntities\associative_vector_compare_predicate_inline.h">
286-
<Filter>Common\associative_vector</Filter>
287-
</ClInclude>
288-
<ClInclude Include="..\..\xrServerEntities\associative_vector_inline.h">
289-
<Filter>Common\associative_vector</Filter>
290-
</ClInclude>
291276
<ClInclude Include="..\..\xrServerEntities\script_export_macroses.h">
292277
<Filter>Scripts</Filter>
293278
</ClInclude>

0 commit comments

Comments
 (0)