Skip to content

Commit

Permalink
Merge pull request #17 from Umbe-Exe/converting_arena_to_object
Browse files Browse the repository at this point in the history 
Converting arena to object
  • Loading branch information
@Umbe-Exe
Umbe-Exe committed Oct 30, 2022
2 parents ecfd128 + 36d00ae commit 0442f0e
Show file tree
Hide file tree
Showing 54 changed files with 1,866 additions and 3,366 deletions.
134 changes: 110 additions & 24 deletions botArena-dynamic.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,12 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\Arena.h" />
<ClInclude Include="src\arena_impl.h" />
<ClInclude Include="src\bot.h" />
<ClInclude Include="src\common.h" />
<ClInclude Include="src\competition.h" />
<ClInclude Include="src\component.h" />
<ClInclude Include="src\config.h" />
<ClInclude Include="src\data.h" />
<ClInclude Include="src\entities.h" />
<ClInclude Include="src\infobox.h" />
<ClInclude Include="src\loadConfig.h" />
<ClInclude Include="src\particles.h" />
<ClInclude Include="src\remover.h" />
<ClInclude Include="src\sound.h" />
<ClInclude Include="src\update.h" />
<ClInclude Include="src\utils.h" />
<ClInclude Include="src\weapon.h" />
</ItemGroup>
Expand All @@ -64,11 +58,11 @@
<ClCompile Include="src\competition.cpp" />
<ClCompile Include="src\entities.cpp" />
<ClCompile Include="src\infobox.cpp" />
<ClCompile Include="src\loadConfig.cpp" />
<ClCompile Include="src\loop.cpp" />
<ClCompile Include="src\parameters.cpp" />
<ClCompile Include="src\particles.cpp" />
<ClCompile Include="src\remover.cpp" />
<ClCompile Include="src\sound.cpp" />
<ClCompile Include="src\update.cpp" />
<ClCompile Include="src\utils.cpp" />
<ClCompile Include="src\weapon.cpp" />
</ItemGroup>
Expand All @@ -85,10 +79,11 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
Expand All @@ -98,10 +93,11 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
Expand Down Expand Up @@ -139,6 +135,8 @@
<Allegro_AddonFont>true</Allegro_AddonFont>
<Allegro_AddonColor>true</Allegro_AddonColor>
<Allegro_AddonVideo>false</Allegro_AddonVideo>
<LinkIncremental>
</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\dynamic\</OutDir>
Expand All @@ -155,6 +153,8 @@
<Allegro_AddonFont>true</Allegro_AddonFont>
<Allegro_AddonColor>true</Allegro_AddonColor>
<Allegro_AddonVideo>false</Allegro_AddonVideo>
<LinkIncremental>
</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\dynamic\</OutDir>
Expand All @@ -171,6 +171,8 @@
<Allegro_AddonFont>true</Allegro_AddonFont>
<Allegro_AddonColor>true</Allegro_AddonColor>
<Allegro_AddonVideo>false</Allegro_AddonVideo>
<LinkIncremental>
</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\dynamic\</OutDir>
Expand All @@ -187,86 +189,170 @@
<Allegro_AddonFont>true</Allegro_AddonFont>
<Allegro_AddonColor>true</Allegro_AddonColor>
<Allegro_AddonVideo>false</Allegro_AddonVideo>
<LinkIncremental>
</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ALLEGRO_NO_MAGIC_MAIN;EXPORTS;WIN32;_DEBUG;BOTARENADYNAMIC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ALLEGRO_NO_MAGIC_MAIN;SOUND;PARTICLES;EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<SupportJustMyCode>true</SupportJustMyCode>
<WholeProgramOptimization>
</WholeProgramOptimization>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions />
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<EnableUAC>
</EnableUAC>
<NoEntryPoint>false</NoEntryPoint>
<EntryPointSymbol>
</EntryPointSymbol>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
<OptimizeReferences>
</OptimizeReferences>
<EnableCOMDATFolding>
</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)resources" "$(SolutionDir)$(Configuration)\$(Platform)\dynamic\resources" /e /i /y</Command>
</PostBuildEvent>
<ProjectReference>
<UseLibraryDependencyInputs>
</UseLibraryDependencyInputs>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ALLEGRO_NO_MAGIC_MAIN;EXPORTS;WIN32;NDEBUG;BOTARENADYNAMIC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ALLEGRO_NO_MAGIC_MAIN;SOUND;PARTICLES;EXPORTS;WIN32;NDEBUG;BOTARENADYNAMIC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<DebugInformationFormat>None</DebugInformationFormat>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WholeProgramOptimization>
</WholeProgramOptimization>
<SupportJustMyCode />
<Optimization>MaxSpeed</Optimization>
<BasicRuntimeChecks />
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<EnableUAC>
</EnableUAC>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<NoEntryPoint>false</NoEntryPoint>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)resources" "$(SolutionDir)$(Configuration)\$(Platform)\dynamic\resources" /e /i /y</Command>
</PostBuildEvent>
<ProjectReference>
<UseLibraryDependencyInputs>
</UseLibraryDependencyInputs>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ALLEGRO_NO_MAGIC_MAIN;EXPORTS;_DEBUG;BOTARENADYNAMIC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ALLEGRO_NO_MAGIC_MAIN;SOUND;PARTICLES;EXPORTS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<SupportJustMyCode>true</SupportJustMyCode>
<WholeProgramOptimization>
</WholeProgramOptimization>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions />
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<EnableUAC>
</EnableUAC>
<NoEntryPoint>false</NoEntryPoint>
<EntryPointSymbol>
</EntryPointSymbol>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
<OptimizeReferences>
</OptimizeReferences>
<EnableCOMDATFolding>
</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)resources" "$(SolutionDir)$(Configuration)\$(Platform)\dynamic\resources" /e /i /y</Command>
</PostBuildEvent>
<ProjectReference>
<UseLibraryDependencyInputs>
</UseLibraryDependencyInputs>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ALLEGRO_NO_MAGIC_MAIN;EXPORTS;NDEBUG;BOTARENADYNAMIC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ALLEGRO_NO_MAGIC_MAIN;SOUND;PARTICLES;EXPORTS;NDEBUG;BOTARENADYNAMIC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<DebugInformationFormat>None</DebugInformationFormat>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WholeProgramOptimization>
</WholeProgramOptimization>
<SupportJustMyCode />
<Optimization>MaxSpeed</Optimization>
<BasicRuntimeChecks />
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<EnableUAC>
</EnableUAC>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<NoEntryPoint>false</NoEntryPoint>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)resources" "$(SolutionDir)$(Configuration)\$(Platform)\dynamic\resources" /e /i /y</Command>
</PostBuildEvent>
<ProjectReference>
<UseLibraryDependencyInputs>
</UseLibraryDependencyInputs>
</ProjectReference>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
42 changes: 12 additions & 30 deletions botArena-dynamic.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<Filter Include="Resource Files">
<UniqueIdentifier>{f2932ce3-0c0d-44ad-8e32-37a97271b8e1}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{0ef3d013-3a59-4412-bc42-d8e97faefc76}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{dc07510f-c5c4-49d1-8eb1-d63848e1dcfe}</UniqueIdentifier>
<UniqueIdentifier>{401dda86-0e1d-4792-92fb-5a7c0cefc631}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{08d49a41-0ab1-45ad-a59a-db5f63f2a58e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -63,45 +63,27 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\competition.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Arena.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\bot.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\component.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\config.h">
<ClInclude Include="src\arena_impl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\data.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\entities.h">
<ClInclude Include="src\bot.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\infobox.h">
<ClInclude Include="src\common.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\loadConfig.h">
<ClInclude Include="src\competition.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\particles.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\remover.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\sound.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\update.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -125,7 +107,10 @@
<ClCompile Include="src\infobox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\loadConfig.cpp">
<ClCompile Include="src\loop.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\parameters.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\particles.cpp">
Expand All @@ -137,9 +122,6 @@
<ClCompile Include="src\sound.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\update.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down

0 comments on commit 0442f0e

Please sign in to comment.