jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-04-14 05:00:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace "ushort" with "uint16_t" and fix missing includes

Browse Source
This commit is contained in:
GravisZro
2024-05-23 23:16:40 -04:00
parent fe855cf85e
commit aebe1bbbb6
187 changed files with 958 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linux/lnxcontroller.cpp
View File

@@ -206,7 +206,7 @@ const char *lnxgameController::get_binding_text(ct_type type, uint8_t ctrl, uint
case ctPOV2:
case ctPOV3:
case ctPOV4: {
ushort povpos = bind;
uint16_t povpos = bind;
if (type == ctPOV)
pov_n = 0;
@@ -941,7 +941,7 @@ bool lnxgameController::enum_controllers() {
// returns the controller with a pov hat
int8_t lnxgameController::get_pov_controller(uint8_t pov) {
// start from controller 2 because 0, and 1 are reserved for keyboard and mouse
ushort pov_flag = CTF_POV << (pov);
uint16_t pov_flag = CTF_POV << (pov);
for (int i = 2; i < m_NumControls; i++)
if ((m_ControlList[i].flags & pov_flag) && m_ControlList[i].id != CTID_INVALID)