Ui components
Compare changes
- fdai7466 authored
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
+ 36
− 1
@@ -286,7 +286,6 @@ void Level::handleSelectingEvents(Engine& engine, SDL_Event& event)
@@ -286,7 +286,6 @@ void Level::handleSelectingEvents(Engine& engine, SDL_Event& event)
@@ -465,6 +464,42 @@ void Level::handleAttackingEvents(Engine& engine, SDL_Event& event)
@@ -465,6 +464,42 @@ void Level::handleAttackingEvents(Engine& engine, SDL_Event& event)