Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #104 - Client does not add Limb Entities to map #111

Merged
merged 4 commits into from
Aug 12, 2017
Merged

Fix issue #104 - Client does not add Limb Entities to map #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b643f8
+ Added new files to the solution
Aug 10, 2017
ac34c84
Merge pull request #4 from TurningWheel/barony-next
Aug 11, 2017
3e05dad
Merge remote-tracking branch 'main/barony-next' into barony-next
Aug 12, 2017
e372fd0
* Changed 'return' to 'continue' to allow limbs to be processed on th…
Aug 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
210 changes: 141 additions & 69 deletions VS.2015/Barony/Barony.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,51 +129,6 @@
<ClCompile Include="..\..\src\init_game.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\bookgui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\clickdescription.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\consolecommand.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\drawminimap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\drawstatus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\identify_and_appraise.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\interface.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\magicgui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\playerinventory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\removecurse.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\screenshot.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\shopgui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\updatecharactersheet.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\updatechestinventory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\updaterightsidebar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\items.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -186,24 +141,6 @@
<ClCompile Include="..\..\src\list.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\actmagic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\act_HandMagic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\castSpell.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\magic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\setupSpells.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\spell.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -312,6 +249,126 @@
<ClCompile Include="..\..\src\player.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_automaton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_cockatrice.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_crystalgolem.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_goatman.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_incubus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_insectoid.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_lichfire.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_lichice.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_scarab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_shadow.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_vampire.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\act_HandMagic.cpp">
<Filter>Source Files\magic</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_kobold.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\actpowercrystal.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\actsummontrap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cursors.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\entity_shared.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\item_tool.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_shared.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\stat_shared.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\bookgui.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\clickdescription.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\consolecommand.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\drawminimap.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\drawstatus.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\identify_and_appraise.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\interface.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\magicgui.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\playerinventory.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\removecurse.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\screenshot.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\shopgui.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\updatecharactersheet.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\updatechestinventory.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\interface\updaterightsidebar.cpp">
<Filter>Source Files\interface</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\actmagic.cpp">
<Filter>Source Files\magic</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\castSpell.cpp">
<Filter>Source Files\magic</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\magic.cpp">
<Filter>Source Files\magic</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\setupSpells.cpp">
<Filter>Source Files\magic</Filter>
</ClCompile>
<ClCompile Include="..\..\src\magic\spell.cpp">
<Filter>Source Files\magic</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\book.hpp">
Expand All @@ -332,15 +389,9 @@
<ClInclude Include="..\..\src\herxlines.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\interface\interface.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\items.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\magic\magic.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\main.hpp">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -392,6 +443,27 @@
<ClInclude Include="..\..\src\player.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\collision.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\colors.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cppfuncs.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\hash.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\paths.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\interface\interface.hpp">
<Filter>Header Files\interface</Filter>
</ClInclude>
<ClInclude Include="..\..\src\magic\magic.hpp">
<Filter>Header Files\magic</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\src\game.ico">
Expand Down
15 changes: 15 additions & 0 deletions VS.2015/editor/editor.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
<ClInclude Include="..\..\VS-includes\Config.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\stat_editor.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\buttons.cpp">
Expand Down Expand Up @@ -77,6 +80,18 @@
<ClCompile Include="..\..\src\entity_editor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\entity_shared.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\stat_editor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\stat_shared.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\items_editor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\wineditoricon.rc">
Expand Down
2 changes: 1 addition & 1 deletion src/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2131,7 +2131,7 @@ void clientHandlePacket()
{
if ( c < 1 || (c < 2 && entity->behavior == &actMonster) )
{
return;
continue;
}
Entity* tempEntity = (Entity*)tempNode->element;
if ( entity->behavior == &actMonster )
Expand Down