diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-07-18 17:59:29 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-07-18 17:59:29 +0200 |
| commit | ee54ce5cf9a702be5efb4a99abe6946a21d4db41 (patch) | |
| tree | e642f2ad801af2127c24a7c5a1b37a32e5a77012 | |
| parent | 8abb8a82c94ee6a703097a116a4aea45e07b079e (diff) | |
Assorted Linux fixes
| -rw-r--r-- | ftnoir_protocol_wine/ftnoir_protocol_wine.cpp | 6 | ||||
| -rw-r--r-- | ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp index c6c038d9..bb877cc6 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp @@ -65,9 +65,9 @@ void FTNoIR_Protocol::sendHeadposeToGame( double *headpose, double *rawheadpose if (shm) { lck_shm.lock(); - for (int i = 0; i < 3; i++) - shm->data[i] = headpose[i] / 57.295781; for (int i = 3; i < 6; i++) + shm->data[i] = headpose[i] / 57.295781; + for (int i = 0; i < 3; i++) shm->data[i] = headpose[i] * 10; if (shm->gameid != gameid) { @@ -75,7 +75,7 @@ void FTNoIR_Protocol::sendHeadposeToGame( double *headpose, double *rawheadpose QMutexLocker foo(&game_name_mutex); /* only EZCA for FSX requires dummy process, and FSX doesn't work on Linux */ /* memory-hacks DLL can't be loaded into a Linux process, either */ - CSV::getGameData(gameid, shm->table, gamename); + CSV::getGameData(shm->gameid, shm->table, gamename); gameid = shm->gameid2 = shm->gameid; connected_game = gamename; } diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx index 8f8a2fb2..a81bccae 100644 --- a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx +++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx @@ -59,7 +59,7 @@ int main(void) data->X = shm_posix->data[TX]; data->Y = shm_posix->data[TY]; data->Z = shm_posix->data[TZ]; - data->DataID = 1; + data->DataID++; data->CamWidth = 250; data->CamHeight = 100; shm_wine->GameID2 = shm_posix->gameid2; |