From 2239cc9f0c1a15d5390589f2727e657a68c0ad40 Mon Sep 17 00:00:00 2001 From: Anon Date: Sat, 30 Jul 2016 13:07:28 -0500 Subject: [PATCH] another travis build fix --- src/input_core/input_core.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/input_core/input_core.cpp b/src/input_core/input_core.cpp index 40c8a3243..08986164b 100644 --- a/src/input_core/input_core.cpp +++ b/src/input_core/input_core.cpp @@ -32,17 +32,17 @@ namespace InputCore { CoreTiming::ScheduleEvent(frame_ticks - cycles_late, tick_event); } - void InputCore::Init() { + void Init() { devices = ParseSettings(); tick_event = CoreTiming::RegisterEvent("InputCore::tick_event", InputTickCallback); CoreTiming::ScheduleEvent(frame_ticks, tick_event); } - void InputCore::Shutdown() { + void Shutdown() { devices.clear(); } - vector> InputCore::ParseSettings() { + vector> ParseSettings() { vector> devices; vector uniqueMappings; //unique mappings from settings file, used to init devices. @@ -97,7 +97,7 @@ namespace InputCore { return devices; } - bool InputCore::CheckIfMappingExists(vector uniqueMapping, Settings::InputDeviceMapping mappingToCheck) { + bool CheckIfMappingExists(vector uniqueMapping, Settings::InputDeviceMapping mappingToCheck) { for (auto& mapping : uniqueMapping) { if (mapping == mappingToCheck) return true;