diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-10-28 09:18:53 -0400 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-10-28 09:18:53 -0400 |
commit | ed10ef9ede3d397672239c3b3dbe42cc6fbe56b4 (patch) | |
tree | 8899b84ca035513550f097c6af3fc236f6bd8be8 /src/ui.cpp | |
parent | 816bedbd011b6729e8be0a4b40213f48fd9d73ca (diff) |
npc dialog
Diffstat (limited to 'src/ui.cpp')
-rw-r--r-- | src/ui.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -238,7 +238,7 @@ namespace ui { void setFontSize(unsigned int size) { (void)size; - /*if (size == 16) { + if (size == 16) { if (!ft16loaded) { loadFontSize(fontSize = size, ftex16, ftdat16); ft16loaded = true; @@ -254,7 +254,7 @@ namespace ui { ftex = &ftex24; ftdat = &ftdat24; fontSize = 24; - }*/ + } } /* @@ -1270,6 +1270,7 @@ void InputSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, //case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONDOWN: + ev.emit<MouseClickEvent>(mouse, e.button.button); // run actions? //if ((action::make = e.button.button & SDL_BUTTON_RIGHT)) |