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

Factor out the game toolbars into a class.

Browse Source 
This includes the following related or incidental changes:
* Remove the win_from_rects global variable. With one minor exception, they were all equal to the relevant render texture's size anyway.
* Split out time advancement from the handle_action function into a separate function
* Split out each individual button action into its own function
* Thanks to the above two, button actions triggered from the keyboard (and menu spells) no longer pass thru handle_action
* Side-effect: keyboard shortcuts and menu spells no longer trigger the button press animation
* Button presses now behave like proper buttons
* Button clicks are now grouped by effect in the handling code, rather than by index
* Removed a variable that mysteriously caused dialogue to become blank
This commit is contained in:
Celtic Minstrel
2020-01-30 00:00:40 -05:00
parent 1d61d48ec3
commit 4859fa70bc
12 changed files with 466 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proj/vs2013/Game/Blades of Exile.vcxproj
View File

@@ -117,6 +117,7 @@
<ClInclude Include="..\..\..\src\game\boe.text.hpp" />
<ClInclude Include="..\..\..\src\game\boe.town.hpp" />
<ClInclude Include="..\..\..\src\game\boe.townspec.hpp" />
<ClInclude Include="..\..\..\src\game\boe.ui.hpp" />
<ClInclude Include="..\..\..\rsrc\menus\boeresource.h" />
</ItemGroup>
<ItemGroup>
@@ -142,6 +143,7 @@
<ClCompile Include="..\..\..\src\game\boe.text.cpp" />
<ClCompile Include="..\..\..\src\game\boe.town.cpp" />
<ClCompile Include="..\..\..\src\game\boe.townspec.cpp" />
<ClCompile Include="..\..\..\src\game\boe.ui.cpp" />
<ClCompile Include="..\..\..\src\pcedit\pc.editors.cpp" />
</ItemGroup>
<ItemGroup>

6
proj/vs2013/Game/Blades of Exile.vcxproj.filters
View File

@@ -81,6 +81,9 @@
<ClInclude Include="..\..\..\src\game\boe.actions.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\game\boe.ui.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\game\boe.actions.cpp">
@@ -140,6 +143,9 @@
<ClCompile Include="..\..\..\src\game\boe.townspec.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\game\boe.ui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\pcedit\pc.editors.cpp">
<Filter>Source Files</Filter>
</ClCompile>

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

@@ -299,6 +299,7 @@
91FCC8D818FE28CC007026CE /* pcedit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 91FCC8D718FE28CC007026CE /* pcedit.xib */; };
91FCC8DC18FE2CE8007026CE /* pc.menus.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 91FCC8DB18FE2CE8007026CE /* pc.menus.mac.mm */; };
91FCC8F418FF0866007026CE /* pc.appleevents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 91FCC8F318FF069A007026CE /* pc.appleevents.mm */; };
91FD417423DFC9D4003D5B8A /* boe.ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91FD417223DFC5C1003D5B8A /* boe.ui.cpp */; };
DCCA42001A8C467000E6A9A5 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E218F87F3700E3EA15 /* SFML.framework */; };
DCCA42021A8C467800E6A9A5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DCCA42011A8C467800E6A9A5 /* libz.dylib */; };
DCCA42031A8C469400E6A9A5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DCCA42011A8C467800E6A9A5 /* libz.dylib */; };
@@ -814,6 +815,8 @@
91FCC8DA18FE2CCA007026CE /* pc.menus.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = pc.menus.hpp; sourceTree = "<group>"; };
91FCC8DB18FE2CE8007026CE /* pc.menus.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = pc.menus.mac.mm; sourceTree = "<group>"; };
91FCC8F318FF069A007026CE /* pc.appleevents.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = pc.appleevents.mm; sourceTree = "<group>"; };
91FD417223DFC5C1003D5B8A /* boe.ui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = boe.ui.cpp; sourceTree = "<group>"; };
91FD417323DFC5C1003D5B8A /* boe.ui.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = boe.ui.hpp; sourceTree = "<group>"; };
91FDB5771A4E71A900DE5983 /* shop.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = shop.hpp; sourceTree = "<group>"; };
91FDB5791A4E774E00DE5983 /* shop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shop.cpp; sourceTree = "<group>"; };
DCCA42011A8C467800E6A9A5 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@@ -1458,6 +1461,7 @@
2BF04B070BF51924006C0831 /* boe.text.cpp */,
2BF04B090BF51924006C0831 /* boe.town.cpp */,
2BF04AD50BF51923006C0831 /* boe.townspec.cpp */,
91FD417223DFC5C1003D5B8A /* boe.ui.cpp */,
);
name = src;
sourceTree = "<group>";
@@ -1485,6 +1489,7 @@
2BF04B080BF51924006C0831 /* boe.text.hpp */,
2BF04B0A0BF51924006C0831 /* boe.town.hpp */,
2BF04AD60BF51923006C0831 /* boe.townspec.hpp */,
91FD417323DFC5C1003D5B8A /* boe.ui.hpp */,
);
name = headers;
sourceTree = "<group>";
@@ -1849,6 +1854,7 @@
919145FC18E3AB1B005CF3A4 /* boe.appleevents.mm in Sources */,
915325171A2E1DF0000A9A1C /* oldstructs.cpp in Sources */,
91B0D5D11E3442FE002BE4DA /* view_dialogs.cpp in Sources */,
91FD417423DFC9D4003D5B8A /* boe.ui.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};