summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2016-03-26 08:50:02 +0100
committerwwylele <wwylele@gmail.com>2016-03-26 08:50:02 +0100
commitaeb29a1a60f0713ea7607c4cda1aab28b73af16a (patch)
tree5319db9aa51130baf0cce63d85a5419eadea820e /src/core
parentremove unnecessary const (diff)
downloadyuzu-aeb29a1a60f0713ea7607c4cda1aab28b73af16a.tar
yuzu-aeb29a1a60f0713ea7607c4cda1aab28b73af16a.tar.gz
yuzu-aeb29a1a60f0713ea7607c4cda1aab28b73af16a.tar.bz2
yuzu-aeb29a1a60f0713ea7607c4cda1aab28b73af16a.tar.lz
yuzu-aeb29a1a60f0713ea7607c4cda1aab28b73af16a.tar.xz
yuzu-aeb29a1a60f0713ea7607c4cda1aab28b73af16a.tar.zst
yuzu-aeb29a1a60f0713ea7607c4cda1aab28b73af16a.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/hid.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index b27ab6d9b..1053d0f40 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -83,17 +83,17 @@ void Update() {
PadState changed = { { (state.hex ^ old_state.hex) } };
// Get the current Pad entry
- PadDataEntry* pad_entry = &mem->pad.entries[mem->pad.index];
+ PadDataEntry& pad_entry = mem->pad.entries[mem->pad.index];
// Update entry properties
- pad_entry->current_state.hex = state.hex;
- pad_entry->delta_additions.hex = changed.hex & state.hex;
- pad_entry->delta_removals.hex = changed.hex & old_state.hex;;
+ pad_entry.current_state.hex = state.hex;
+ pad_entry.delta_additions.hex = changed.hex & state.hex;
+ pad_entry.delta_removals.hex = changed.hex & old_state.hex;;
// Set circle Pad
- pad_entry->circle_pad_x = state.circle_left ? -MAX_CIRCLEPAD_POS :
+ pad_entry.circle_pad_x = state.circle_left ? -MAX_CIRCLEPAD_POS :
state.circle_right ? MAX_CIRCLEPAD_POS : 0x0;
- pad_entry->circle_pad_y = state.circle_down ? -MAX_CIRCLEPAD_POS :
+ pad_entry.circle_pad_y = state.circle_down ? -MAX_CIRCLEPAD_POS :
state.circle_up ? MAX_CIRCLEPAD_POS : 0x0;
// If we just updated index 0, provide a new timestamp
@@ -106,11 +106,11 @@ void Update() {
next_touch_index = (next_touch_index + 1) % mem->touch.entries.size();
// Get the current touch entry
- TouchDataEntry* touch_entry = &mem->touch.entries[mem->touch.index];
+ TouchDataEntry& touch_entry = mem->touch.entries[mem->touch.index];
bool pressed = false;
- std::tie(touch_entry->x, touch_entry->y, pressed) = VideoCore::g_emu_window->GetTouchState();
- touch_entry->valid.Assign(pressed ? 1 : 0);
+ std::tie(touch_entry.x, touch_entry.y, pressed) = VideoCore::g_emu_window->GetTouchState();
+ touch_entry.valid.Assign(pressed ? 1 : 0);
// TODO(bunnei): We're not doing anything with offset 0xA8 + 0x18 of HID SharedMemory, which
// supposedly is "Touch-screen entry, which contains the raw coordinate data prior to being