fix some things

2 files changed, 6 insertions, 6 deletions

diff --git a/common/accel-natural.hpp b/common/accel-natural.hpp
index 8d25351..9f76d1a 100644
--- a/common/accel-natural.hpp
+++ b/common/accel-natural.hpp
@@ -28,7 +28,7 @@ namespace rawaccel {
 
 			double offset_x = offset - x;
 			double decay = exp(accel * offset_x);
-			return limit * (1 - (decay * offset_x + offset) / x) + 1;
+			return limit * (1 - (offset - decay * offset_x) / x) + 1;
 		}
 
 		using natural_base::natural_base;
@@ -43,7 +43,7 @@ namespace rawaccel {
 
 			double offset_x = offset - x;
 			double decay = exp(accel * offset_x);
-			double output = limit * (offset_x + decay / accel) + constant;
+			double output = limit * (decay / accel - offset_x) + constant;
 			return output / x + 1;
 		}
 
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index 7992de6..6376100 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -517,9 +517,9 @@ public:
             auto settings = gcnew ExtendedSettings();
             Marshal::PtrToStructure(IntPtr(&instance->data.args), settings->baseSettings);
             settings->tables.x = extract(instance->data.args.argsv.x.lut_args.mode, 
-                instance->data.mod.accels.x);
+                instance->data.mod.accel.x);
             settings->tables.y = extract(instance->data.args.argsv.y.lut_args.mode,
-                instance->data.mod.accels.y);
+                instance->data.mod.accel.y);
             return settings;
         }
 
@@ -530,11 +530,11 @@ public:
             instance->inv = ra::invokers(instance->data.args);
 
             if (val->tables.x) {
-                val->tables.x->SetData(instance->data.mod.accels.x);
+                val->tables.x->SetData(instance->data.mod.accel.x);
             }
 
             if (val->tables.y) {
-                val->tables.y->SetData(instance->data.mod.accels.y);
+                val->tables.y->SetData(instance->data.mod.accel.y);
             }   
         }