aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornathansmithsmith <nathansmith7@mailfence.com>2023-08-06 17:12:18 -0600
committernathansmithsmith <nathansmith7@mailfence.com>2023-08-06 17:12:18 -0600
commit0fae2327bbb24572f5c40236dcdaba4f4f8afb80 (patch)
treeedc36da854b597ecd5cb1b645c92abadf5824067 /src
parent0e3f2f54c73ea3d473c38159dcb180eeb7988f4b (diff)
Fixed the stupid mouse thingy
Diffstat (limited to 'src')
-rw-r--r--src/entities/antifaShip.c6
-rw-r--r--src/entity.c2
-rw-r--r--src/settings.c4
3 files changed, 5 insertions, 7 deletions
diff --git a/src/entities/antifaShip.c b/src/entities/antifaShip.c
index f9c9867..6e8c239 100644
--- a/src/entities/antifaShip.c
+++ b/src/entities/antifaShip.c
@@ -14,7 +14,7 @@ void initAntifaShip(Entity * entity, Game * game) {
entity->acceleration = (EntityAcceleration){
.speedUp = 30.0,
.speedDown = 15,
- .rotation = (Vector3){2.0, 2.0, 2.0}
+ .rotation = (Vector3){2000000.0, 2000000.0, 2000000.0}
};
// Set Data pointer.
@@ -26,7 +26,7 @@ void initAntifaShip(Entity * entity, Game * game) {
}
AntifaShip * data = (AntifaShip*)entity->data;
- data->lastMouse = Vector2Zero();
+ data->lastMouse = GetMousePosition();
data->forwardSpeed = 0.0;
}
@@ -99,8 +99,6 @@ void controlAntifaShipKeyboardAndMouse(Game * game, Entity * entity) {
mouseStick.z = -mouseStick.y;
mouseStick.y = 0.0;
}
-
- printVector2(v);
entityJoystickControl(entity, mouseStick, data->forwardSpeed);
}
diff --git a/src/entity.c b/src/entity.c
index 4136463..bb874df 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -437,7 +437,7 @@ void entityJoystickControl(Entity * entity, Vector3 stick, float speed) {
entity->velocity.velocity = (Vector3){
m.m2 * s,
m.m6 * s,
- m.m10 * s
+ m.m10 * s,
};
entityUpdatePosition(entity);
diff --git a/src/settings.c b/src/settings.c
index 62d6b72..c79b342 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -3,14 +3,14 @@
void initSettings(Settings * settings) {
*settings = (Settings){
.controlMode = KEYBOARD_AND_MOUSE_CONTROL,
- .mouseSensitivity = 0.05,
+ .mouseSensitivity = 0.3,
.scrollBarSpeed = 10.0,
.gamePadNum = 0,
.pitchStick = 1,
.yawStick = 0,
.rollStick = 2,
.speedStick = 3,
- .joystickSensitivity = 1000.0,
+ .joystickSensitivity = 0.5,
.fps = 0,
.drawFps = true
};