yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #4583 from lioncash/trunc 

gc_poller: Resolve compilation warnings on MSVC
This commit is contained in:
bunnei 2020-09-03 20:23:33 -04:00 committed by GitHub
parent 40c230e0fa f60d5aac3e
commit 3b0fe38e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input_common/gcadapter/gc_poller.cpp
View File

@ -38,7 +38,8 @@ public:
explicit GCAxisButton(int port_, int axis_, float threshold_, bool trigger_if_greater_, explicit GCAxisButton(int port_, int axis_, float threshold_, bool trigger_if_greater_,
GCAdapter::Adapter* adapter) GCAdapter::Adapter* adapter)
: port(port_), axis(axis_), threshold(threshold_), trigger_if_greater(trigger_if_greater_), : port(port_), axis(axis_), threshold(threshold_), trigger_if_greater(trigger_if_greater_),
gcadapter(adapter), origin_value(adapter->GetOriginValue(port_, axis_)) {} gcadapter(adapter),
origin_value(static_cast<float>(adapter->GetOriginValue(port_, axis_))) {}
bool GetStatus() const override { bool GetStatus() const override {
if (gcadapter->DeviceConnected(port)) { if (gcadapter->DeviceConnected(port)) {
@ -151,8 +152,9 @@ public:
GCAnalog(int port_, int axis_x_, int axis_y_, float deadzone_, GCAdapter::Adapter* adapter, GCAnalog(int port_, int axis_x_, int axis_y_, float deadzone_, GCAdapter::Adapter* adapter,
float range_) float range_)
: port(port_), axis_x(axis_x_), axis_y(axis_y_), deadzone(deadzone_), gcadapter(adapter), : port(port_), axis_x(axis_x_), axis_y(axis_y_), deadzone(deadzone_), gcadapter(adapter),
origin_value_x(adapter->GetOriginValue(port_, axis_x_)), origin_value_x(static_cast<float>(adapter->GetOriginValue(port_, axis_x_))),
origin_value_y(adapter->GetOriginValue(port_, axis_y_)), range(range_) {} origin_value_y(static_cast<float>(adapter->GetOriginValue(port_, axis_y_))),
range(range_) {}
float GetAxis(int axis) const { float GetAxis(int axis) const {
if (gcadapter->DeviceConnected(port)) { if (gcadapter->DeviceConnected(port)) {