3 files changed, 13 insertions, 7 deletions
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
index db030554..5f80944a 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
@@ -3,7 +3,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>        /* For mode constants */
 #include <fcntl.h>           /* For O_* constants */
-#include "ftnoir_csv/csv.h"
+#include "csv/csv.h"
 
 FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0)
 {
diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx
index 9a07681c..d5d03011 100644
--- a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx
+++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx
@@ -1,6 +1,6 @@
 #include <cerrno>
 #include <cstdio>
-#include "ftnoir_protocol_ft/fttypes.h"
+#include "freetrackclient/fttypes.h"
 #include "ftnoir_protocol_wine/wine-shm.h"
 
 #define OPENTRACK_CROSS_ONLY
@@ -61,8 +61,8 @@ int main(void)
 			break;
 		}
 		lck_wine.lock();
-        data->Yaw = shm_posix->data[Yaw];
-        data->Pitch = shm_posix->data[Pitch];
+        data->Yaw = -shm_posix->data[Yaw];
+        data->Pitch = -shm_posix->data[Pitch];
         data->Roll = shm_posix->data[Roll];
         data->X = shm_posix->data[TX];
         data->Y = shm_posix->data[TY];
diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx
index b7dc531c..5d19608a 100644
--- a/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx
+++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx
@@ -8,14 +8,15 @@
 #include "compat/compat.cpp"
 #include "wine-shm.h"
 
-void create_registry_key(void) {
+static void write_path(const char* key, const char* subkey)
+{
     char dir[8192];
 
     if (GetCurrentDirectoryA(8192, dir) < 8190)
     {
         HKEY hkpath;
         if (RegCreateKeyExA(HKEY_CURRENT_USER,
-                            "Software\\NaturalPoint\\NATURALPOINT\\NPClient Location",
+                            key,
                             0,
                             NULL,
                             0,
@@ -28,8 +29,13 @@ void create_registry_key(void) {
                 if (dir[i] == '\\')
                     dir[i] = '/';
             strcat(dir, "/");
-            (void) RegSetValueExA(hkpath, "Path", 0, REG_SZ, (BYTE*) dir, strlen(dir) + 1);
+            (void) RegSetValueExA(hkpath, subkey, 0, REG_SZ, (BYTE*) dir, strlen(dir) + 1);
             RegCloseKey(hkpath);
         }
     }
 }
+
+void create_registry_key(void) {
+    write_path("Software\\NaturalPoint\\NATURALPOINT\\NPClient Location", "Path");
+    write_path("Software\\Freetrack\\FreeTrackClient", "Path");
+}