diff options
| author | nathansmithsmith <nathansmith7@mailfence.com> | 2023-10-06 23:18:20 -0600 |
|---|---|---|
| committer | nathansmithsmith <nathansmith7@mailfence.com> | 2023-10-06 23:18:20 -0600 |
| commit | 71f748a76ef0b86b6377ea82cb2e7e785d28b647 (patch) | |
| tree | b66c022e3a9d74600f165f04f08a2f4d2f66f339 | |
| parent | a3e1d468a46f2f463500ccbec042e96350f74475 (diff) | |
Fixed issues I should have fixed a while ago
| -rw-r--r-- | src/entities/antifaShip.c | 1 | ||||
| -rw-r--r-- | src/entities/soldato.c | 4 | ||||
| -rw-r--r-- | src/levels/level1.c | 6 | ||||
| -rw-r--r-- | src/radar.h | 2 | ||||
| -rw-r--r-- | src/settings.c | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/src/entities/antifaShip.c b/src/entities/antifaShip.c index 36d438c..e7f6d91 100644 --- a/src/entities/antifaShip.c +++ b/src/entities/antifaShip.c @@ -97,6 +97,7 @@ void controlAntifaShipKeyboardAndMouse(Game * game, Entity * entity) { data->forwardSpeed = ANTIFA_SHIP_MAX_SPEED; Vector2 v = Vector2Subtract(mouse, data->lastMouse); + v = Vector2Scale(v, 1.0 / GetFrameTime()); data->lastMouse = mouse; // Using mouse as a joystick. diff --git a/src/entities/soldato.c b/src/entities/soldato.c index 2122a5a..4230177 100644 --- a/src/entities/soldato.c +++ b/src/entities/soldato.c @@ -200,6 +200,10 @@ void setSoldatoLeader(Entity * entity1, Entity * entity2) { // Already has leader. if (follower->follow.leaderId != ENTITY_NONE) return; + // Stops funny thingy. + if (follower->follow.followerFingerprint == leader->fingerprint + || leader->follow.leaderFingerprint == follower->fingerprint) + return; follower->follow.leaderId = leader->id; follower->follow.leaderFingerprint = leader->fingerprint; diff --git a/src/levels/level1.c b/src/levels/level1.c index db3e102..8d661b8 100644 --- a/src/levels/level1.c +++ b/src/levels/level1.c @@ -6,17 +6,17 @@ void initLevel1(Game * game, Levels * levels) { int i; - WorldEntry entries[101] = { + WorldEntry entries[21] = { (WorldEntry){ENTITY_ANTIFA, (Vector3){0.0, 0.0, 0.0}, QuaternionIdentity()}, }; double distanceApart = 15.0; double startAtDistance = 100.0; - for (i = 1; i < 100; ++i) { + for (i = 1; i < 21; ++i) { entries[i] = (WorldEntry){ ENTITY_SOLDATO, - (Vector3){0.0, i * distanceApart + startAtDistance, i * distanceApart + startAtDistance}, + (Vector3){0.0, (i * distanceApart) + startAtDistance, (i * distanceApart) + startAtDistance}, QuaternionIdentity() }; } diff --git a/src/radar.h b/src/radar.h index 65ea41f..4719d7b 100644 --- a/src/radar.h +++ b/src/radar.h @@ -5,7 +5,7 @@ #define RADAR_TEXTURE_SIZE 200 #define RADAR_WORLD_SCALE 0.01 -#define RADAR_POINT_SIZE 1.0 +#define RADAR_POINT_SIZE 0.75 #define RADAR_MAX_DISTANCE 2000.0 #define RADAR_CAMERA_DISTANCE 6.0 diff --git a/src/settings.c b/src/settings.c index 35de96f..391169b 100644 --- a/src/settings.c +++ b/src/settings.c @@ -3,7 +3,7 @@ void initSettings(Settings * settings) { *settings = (Settings){ .controlMode = KEYBOARD_AND_MOUSE_CONTROL, - .mouseSensitivity = 0.1, + .mouseSensitivity = 0.0016, .scrollBarSpeed = 10.0, .lockMouse = true, .gamePadNum = 0, |