openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Dialog XML definitions are now loaded thru the resource manager

Browse Source
This commit is contained in:
Celtic Minstrel
2023-01-07 11:59:42 -05:00
parent c3dd886783
commit e3d6a4748e
25 changed files with 222 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proj/vs2013/Common/Common.vcxproj
View File

@@ -227,6 +227,7 @@
<ClCompile Include="..\..\..\src\fileio\xml-parser\tinyxmlerror.cpp" />
<ClCompile Include="..\..\..\src\fileio\xml-parser\tinyxmlparser.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_cursor.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_dialog.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_font.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_image.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_sound.cpp" />
@@ -297,6 +298,7 @@
<ClInclude Include="..\..\..\src\fileio\map_parse.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\resmgr.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_cursor.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_dialog.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_font.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_image.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_sound.hpp" />
@@ -536,4 +538,4 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\GitInfo.2.0.10\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitInfo.2.0.10\build\GitInfo.targets'))" />
</Target>
</Project>
</Project>

8
proj/vs2013/Common/Common.vcxproj.filters
View File

@@ -719,6 +719,9 @@
<ClCompile Include="..\..\..\src\fileio\resmgr\res_cursor.cpp">
<Filter>FileIO\ResMgr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\fileio\resmgr\res_dialog.cpp">
<Filter>FileIO\ResMgr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\fileio\resmgr\res_font.cpp">
<Filter>FileIO\ResMgr</Filter>
</ClCompile>
@@ -1004,6 +1007,9 @@
<ClInclude Include="..\..\..\src\fileio\resmgr\res_cursor.hpp">
<Filter>FileIO\ResMgr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\fileio\resmgr\res_dialog.hpp">
<Filter>FileIO\ResMgr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\fileio\resmgr\res_font.hpp">
<Filter>FileIO\ResMgr</Filter>
</ClInclude>
@@ -1033,4 +1039,4 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project>
</Project>

4
proj/vs2017/Common/Common.vcxproj
View File

@@ -368,6 +368,7 @@
<ClCompile Include="..\..\..\src\fileio\gzstream\gzstream.cpp" />
<ClCompile Include="..\..\..\src\fileio\map_parse.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_cursor.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_dialog.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_font.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_image.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_sound.cpp" />
@@ -447,6 +448,7 @@
<ClInclude Include="..\..\..\src\fileio\map_parse.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\resmgr.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_cursor.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_dialog.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_font.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_image.hpp" />
<ClInclude Include="..\..\..\src\fileio\resmgr\res_sound.hpp" />
@@ -584,4 +586,4 @@
</Copy>
<Message Text="changed:@(ChangedScenarios)" Importance="high" />
</Target>
</Project>
</Project>

5
proj/vs2017/Common/Common.vcxproj.filters
View File

@@ -786,6 +786,9 @@
<ClInclude Include="..\..\..\src\fileio\resmgr\res_cursor.hpp">
<Filter>FileIO\ResMgr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\fileio\resmgr\res_dialog.hpp">
<Filter>FileIO\ResMgr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\fileio\resmgr\res_font.hpp">
<Filter>FileIO\ResMgr</Filter>
</ClInclude>
@@ -1008,4 +1011,4 @@
<Filter>DialogXML\Widgets</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>

6
proj/xc12/BoE.xcodeproj/project.pbxproj
View File

@@ -217,6 +217,7 @@
919F2ED5287F023100F47750 /* libboost_filesystem-mt.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDBFA19006CC9003E7FED /* libboost_filesystem-mt.dylib */; };
919F2ED6287F023100F47750 /* libboost_system-mt.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDBFB19006CC9003E7FED /* libboost_system-mt.dylib */; };
91A0B1601900FFE500EF438F /* mask.frag in Copy Shaders */ = {isa = PBXBuildFile; fileRef = 91A0B15A1900F73E00EF438F /* mask.frag */; };
91A2480E2969CFD200B8D90F /* res_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91A2480D2969CFD200B8D90F /* res_dialog.cpp */; };
91ACCE7619002E5F00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */; };
91ACCE7719002E5F00FAEF8B /* sfml-graphics.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */; };
91ACCE7919002E5F00FAEF8B /* sfml-system.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E018F87F3700E3EA15 /* sfml-system.framework */; };
@@ -736,6 +737,8 @@
919F2E99287E5BB700F47750 /* tagfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = tagfile.cpp; sourceTree = "<group>"; };
919F2EAF287F00B800F47750 /* boe_test.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = boe_test.entitlements; sourceTree = "<group>"; };
91A0B15A1900F73E00EF438F /* mask.frag */ = {isa = PBXFileReference; explicitFileType = sourcecode.glsl; fileEncoding = 4; path = mask.frag; sourceTree = "<group>"; };
91A2480D2969CFD200B8D90F /* res_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = res_dialog.cpp; sourceTree = "<group>"; };
91A248142969CFE000B8D90F /* res_dialog.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = res_dialog.hpp; sourceTree = "<group>"; };
91A32BD10FDB797B00C4E957 /* basicbtns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = basicbtns.cpp; sourceTree = "<group>"; };
91AC607E0FA26A3B00EEAE67 /* area.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = area.hpp; sourceTree = "<group>"; };
91AC607F0FA26A3B00EEAE67 /* town_import.tpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = town_import.tpp; sourceTree = "<group>"; };
@@ -1123,11 +1126,13 @@
isa = PBXGroup;
children = (
91EC1EFF23DDFF9D00271891 /* res_cursor.cpp */,
91A2480D2969CFD200B8D90F /* res_dialog.cpp */,
91EC1F0023DDFF9D00271891 /* res_font.cpp */,
91EC1F0123DDFF9D00271891 /* res_image.cpp */,
91EC1F0223DDFF9D00271891 /* res_sound.cpp */,
91EC1F0323DDFF9D00271891 /* res_strings.cpp */,
9185BDA51EA055180027C346 /* res_cursor.hpp */,
91A248142969CFE000B8D90F /* res_dialog.hpp */,
9185BDA61EA055180027C346 /* res_font.hpp */,
912DFE8A18E24B4C00B00D75 /* res_image.hpp */,
9185BDA71EA055180027C346 /* res_sound.hpp */,
@@ -2054,6 +2059,7 @@
91CE248A1EA12866005BDCE4 /* utility.cpp in Sources */,
91CE248C1EA12A96005BDCE4 /* render_text.cpp in Sources */,
91CE248E1EA12AA3005BDCE4 /* render_shapes.cpp in Sources */,
91A2480E2969CFD200B8D90F /* res_dialog.cpp in Sources */,
91CE24921EA12ABD005BDCE4 /* gfxsheets.cpp in Sources */,
91CE24931EA12AC9005BDCE4 /* tiling.cpp in Sources */,
91EC1F0423DDFF9D00271891 /* res_cursor.cpp in Sources */,