Skip to content

Commit

Permalink
- add ActTextSetColor
Browse files Browse the repository at this point in the history
- add FocusAdd action
- add drawable.setAction
- add hasEvent to game
- add support to prefixes/suffixes to itemClasses
- add zoom label to UI
- add zoom support to level
- change menu parsing code to support listing items
- delete unused utils classes
- disable hover on level when hovering over inventory/etc
- fix fade effect not resizing
- implement descriptions in items
- merge setBitmapFont and SetFont
- move selectedItem from level to player
- refactor ActItem.h
- refactor ItemClass parsing to support cloning items
- refactor UIObject implementations to use new setAction + parsing code
- refactor getProperty into Queryable interface
- refactor item code
- refactor parseFile to support replaceVars functionality
- refactor view (add zoom)
- remove item.pickFromLevel (move to loadFromLevel)
- update UIObject to add setAction
- update item + player related code
- update item description code to use namers
- update menu parser code (exclude)
- update stash to show non equipable items
- update switch condition to allow empty actions
- update toolset (vs2017)
- update variant
- update gamefiles (items, zoom on level using scroll, list unidentified items in Cain's panel)
  • Loading branch information
demo committed Mar 19, 2017
1 parent d4f36b5 commit 72df62b
Show file tree
Hide file tree
Showing 217 changed files with 9,943 additions and 3,062 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
/CMakeFiles
/cmake_install.cmake
/Debug
/Debug Clang
/Debug VS2015
/DGEngine
/DIABDAT
/DIABDAT.*
Expand Down
19 changes: 13 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ set(SOURCE_FILES
src/Pcx.h
src/PhysFSStream.cpp
src/PhysFSStream.h
src/Queryable.h
src/Rectangle.cpp
src/Rectangle.h
src/ResourceManager.cpp
Expand All @@ -90,6 +91,7 @@ set(SOURCE_FILES
src/Utils.h
src/Variable.cpp
src/Variable.h
src/Variant.h
src/View2.cpp
src/View2.h
src/Actions/ActAction.h
Expand Down Expand Up @@ -131,8 +133,13 @@ set(SOURCE_FILES
src/Game/ImageLevelObject.h
src/Game/Item.cpp
src/Game/Item.h
src/Game/ItemClass.cpp
src/Game/ItemClass.h
src/Game/ItemCollection.cpp
src/Game/ItemCollection.h
src/Game/ItemLocation.h
src/Game/ItemProperties.h
src/Game/ItemXY.h
src/Game/Level.cpp
src/Game/Level.h
src/Game/LevelHelper.cpp
Expand All @@ -141,6 +148,9 @@ set(SOURCE_FILES
src/Game/LevelMap.h
src/Game/LevelObject.h
src/Game/MapCoord.h
src/Game/Namer.cpp
src/Game/Namer.h
src/Game/PairXY.h
src/Game/PathFinder.cpp
src/Game/PathFinder.h
src/Game/Player.cpp
Expand Down Expand Up @@ -195,10 +205,6 @@ set(SOURCE_FILES
src/Parser/ParseMenu.h
src/Parser/ParseMenuButton.cpp
src/Parser/ParseMenuButton.h
src/Parser/ParseMenuQuests.cpp
src/Parser/ParseMenuQuests.h
src/Parser/ParseMenuSaveGames.cpp
src/Parser/ParseMenuSaveGames.h
src/Parser/ParseMountFile.cpp
src/Parser/ParseMountFile.h
src/Parser/ParseMovie.cpp
Expand Down Expand Up @@ -227,6 +233,8 @@ set(SOURCE_FILES
src/Parser/Game/ParseLevel.h
src/Parser/Game/ParseLevelObject.cpp
src/Parser/Game/ParseLevelObject.h
src/Parser/Game/ParseNamer.cpp
src/Parser/Game/ParseNamer.h
src/Parser/Game/ParsePlayer.cpp
src/Parser/Game/ParsePlayer.h
src/Parser/Game/ParsePlayerClass.cpp
Expand All @@ -241,8 +249,6 @@ set(SOURCE_FILES
src/Parser/Utils/ParseUtilsKey.h
src/Parser/Utils/ParseUtilsVal.cpp
src/Parser/Utils/ParseUtilsVal.h
src/Parser/Utils/ParseUtilsVar.cpp
src/Parser/Utils/ParseUtilsVar.h
src/rapidjson/allocators.h
src/rapidjson/document.h
src/rapidjson/encodedstream.h
Expand Down Expand Up @@ -282,6 +288,7 @@ set(SOURCE_FILES
src/variant/recursive_wrapper.hpp
src/variant/variant.hpp
src/variant/variant_io.hpp
src/variant/variant_visitor.hpp
)

add_executable(${PROJECT_NAME} ${SOURCE_FILES})
Expand Down
10 changes: 8 additions & 2 deletions DGEngine.sln
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DGEngine", "DGEngine.vcxproj", "{B30255A6-E921-4847-9FB1-26842AB465A4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Clang|Win32 = Debug Clang|Win32
Debug NoMovie|Win32 = Debug NoMovie|Win32
Debug VS2015|Win32 = Debug VS2015|Win32
Debug|Win32 = Debug|Win32
Release NoMovie|Win32 = Release NoMovie|Win32
Release Static|Win32 = Release Static|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug Clang|Win32.ActiveCfg = Debug Clang|Win32
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug Clang|Win32.Build.0 = Debug Clang|Win32
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug NoMovie|Win32.ActiveCfg = Debug NoMovie|Win32
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug NoMovie|Win32.Build.0 = Debug NoMovie|Win32
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug VS2015|Win32.ActiveCfg = Debug VS2015|Win32
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug VS2015|Win32.Build.0 = Debug VS2015|Win32
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug|Win32.ActiveCfg = Debug|Win32
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug|Win32.Build.0 = Debug|Win32
{B30255A6-E921-4847-9FB1-26842AB465A4}.Release NoMovie|Win32.ActiveCfg = Release NoMovie|Win32
Expand Down
94 changes: 78 additions & 16 deletions DGEngine.vcxproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Clang|Win32">
<Configuration>Debug Clang</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug NoMovie|Win32">
<Configuration>Debug NoMovie</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug VS2015|Win32">
<Configuration>Debug VS2015</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
Expand Down Expand Up @@ -45,6 +53,7 @@
<ClCompile Include="src\Game\Level.cpp" />
<ClCompile Include="src\Game\LevelHelper.cpp" />
<ClCompile Include="src\Game\LevelMap.cpp" />
<ClCompile Include="src\Game\Namer.cpp" />
<ClCompile Include="src\Game\PathFinder.cpp" />
<ClCompile Include="src\Game\Player.cpp" />
<ClCompile Include="src\Game\PlayerClass.cpp" />
Expand All @@ -64,6 +73,7 @@
<ClCompile Include="src\Parser\Game\ParseItemClass.cpp" />
<ClCompile Include="src\Parser\Game\ParseLevel.cpp" />
<ClCompile Include="src\Parser\Game\ParseLevelObject.cpp" />
<ClCompile Include="src\Parser\Game\ParseNamer.cpp" />
<ClCompile Include="src\Parser\Game\ParsePlayer.cpp" />
<ClCompile Include="src\Parser\Game\ParsePlayerClass.cpp" />
<ClCompile Include="src\Parser\Game\ParseQuest.cpp" />
Expand All @@ -88,8 +98,6 @@
<ClCompile Include="src\Parser\ParseLoadingScreen.cpp" />
<ClCompile Include="src\Parser\ParseMenu.cpp" />
<ClCompile Include="src\Parser\ParseMenuButton.cpp" />
<ClCompile Include="src\Parser\ParseMenuQuests.cpp" />
<ClCompile Include="src\Parser\ParseMenuSaveGames.cpp" />
<ClCompile Include="src\Parser\ParseMountFile.cpp" />
<ClCompile Include="src\Parser\ParseMovie.cpp" />
<ClCompile Include="src\Parser\ParsePalette.cpp" />
Expand All @@ -104,7 +112,6 @@
<ClCompile Include="src\Parser\Utils\ParseUtilsIdx.cpp" />
<ClCompile Include="src\Parser\Utils\ParseUtilsKey.cpp" />
<ClCompile Include="src\Parser\Utils\ParseUtilsVal.cpp" />
<ClCompile Include="src\Parser\Utils\ParseUtilsVar.cpp" />
<ClCompile Include="src\Pcx.cpp" />
<ClCompile Include="src\PhysFSStream.cpp" />
<ClCompile Include="src\Rectangle.cpp" />
Expand Down Expand Up @@ -167,11 +174,16 @@
<ClInclude Include="src\Game\Item.h" />
<ClInclude Include="src\Game\ItemClass.h" />
<ClInclude Include="src\Game\ItemCollection.h" />
<ClInclude Include="src\Game\ItemLocation.h" />
<ClInclude Include="src\Game\ItemProperties.h" />
<ClInclude Include="src\Game\ItemXY.h" />
<ClInclude Include="src\Game\Level.h" />
<ClInclude Include="src\Game\LevelHelper.h" />
<ClInclude Include="src\Game\LevelMap.h" />
<ClInclude Include="src\Game\LevelObject.h" />
<ClInclude Include="src\Game\MapCoord.h" />
<ClInclude Include="src\Game\Namer.h" />
<ClInclude Include="src\Game\PairXY.h" />
<ClInclude Include="src\Game\PathFinder.h" />
<ClInclude Include="src\Game\Player.h" />
<ClInclude Include="src\Game\PlayerClass.h" />
Expand All @@ -188,6 +200,7 @@
<ClInclude Include="src\Parser\Game\ParseItemClass.h" />
<ClInclude Include="src\Parser\Game\ParseLevel.h" />
<ClInclude Include="src\Parser\Game\ParseLevelObject.h" />
<ClInclude Include="src\Parser\Game\ParseNamer.h" />
<ClInclude Include="src\Parser\Game\ParsePlayer.h" />
<ClInclude Include="src\Parser\Game\ParsePlayerClass.h" />
<ClInclude Include="src\Parser\Game\ParseQuest.h" />
Expand All @@ -212,8 +225,6 @@
<ClInclude Include="src\Parser\ParseLoadingScreen.h" />
<ClInclude Include="src\Parser\ParseMenu.h" />
<ClInclude Include="src\Parser\ParseMenuButton.h" />
<ClInclude Include="src\Parser\ParseMenuQuests.h" />
<ClInclude Include="src\Parser\ParseMenuSaveGames.h" />
<ClInclude Include="src\Parser\ParseMountFile.h" />
<ClInclude Include="src\Parser\ParseMovie.h" />
<ClInclude Include="src\Parser\ParsePalette.h" />
Expand All @@ -228,7 +239,7 @@
<ClInclude Include="src\Parser\Utils\ParseUtilsIdx.h" />
<ClInclude Include="src\Parser\Utils\ParseUtilsKey.h" />
<ClInclude Include="src\Parser\Utils\ParseUtilsVal.h" />
<ClInclude Include="src\Parser\Utils\ParseUtilsVar.h" />
<ClInclude Include="src\Queryable.h" />
<ClInclude Include="src\Rectangle.h" />
<ClInclude Include="src\ReverseIterable.h" />
<ClInclude Include="src\SFMLUtils.h" />
Expand Down Expand Up @@ -262,15 +273,23 @@
<ClInclude Include="src\UIObject.h" />
<ClInclude Include="src\Utils.h" />
<ClInclude Include="src\Variable.h" />
<ClInclude Include="src\Variant.h" />
<ClInclude Include="src\View2.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B30255A6-E921-4847-9FB1-26842AB465A4}</ProjectGuid>
<RootNamespace>DGEngine</RootNamespace>
<ProjectName>DGEngine</ProjectName>
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2015|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
Expand All @@ -279,27 +298,33 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug NoMovie|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Clang|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141_clang_c2</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release NoMovie|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand All @@ -309,9 +334,15 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2015|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug NoMovie|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Clang|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
Expand All @@ -323,10 +354,26 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2015|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug NoMovie|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Clang|Win32'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\SFML\include;.\PhysicsFS\src;.\sfeMovie\debug\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>freetype.lib;jpeg.lib;openal32.lib;sfml-audio-d.lib;sfml-graphics-d.lib;sfml-main-d.lib;sfml-network-d.lib;sfml-system-d.lib;sfml-window-d.lib;physfs.lib;sfeMovie-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>.\SFML\lib;.\PhysicsFS\MinSizeRel;.\sfeMovie\debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2015|Win32'">
<ClCompile>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\SFML\include;.\PhysicsFS\src;.\sfeMovie\debug\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Expand All @@ -340,7 +387,22 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug NoMovie|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\SFML\include;.\PhysicsFS\src;.\sfeMovie\debug\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_SFML_MOVIE_STUB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>freetype.lib;jpeg.lib;openal32.lib;sfml-audio-d.lib;sfml-graphics-d.lib;sfml-main-d.lib;sfml-network-d.lib;sfml-system-d.lib;sfml-window-d.lib;physfs.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>.\SFML\lib;.\PhysicsFS\MinSizeRel;.\sfeMovie\debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Clang|Win32'">
<ClCompile>
<WarningLevel>EnableAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\SFML\include;.\PhysicsFS\src;.\sfeMovie\debug\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Expand All @@ -355,7 +417,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
Expand All @@ -374,7 +436,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release NoMovie|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
Expand All @@ -394,7 +456,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
Expand Down
Loading

0 comments on commit 72df62b

Please sign in to comment.