Burer/m4kc
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

Player movement is slower when in water

Browse Source
This commit is contained in:
Sasha Koshka
2022-04-30 22:19:31 -04:00
parent bc2fd091fb
commit 6c57d37777
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gameloop.c
View File

@@ -256,7 +256,7 @@ int gameLoop (
while (SDL_GetTicks() - l > 10L) {
gameTime++;
l += 10L;
gameLoop_processMovement(inputs);
gameLoop_processMovement(inputs, inWater);
}
if (!gamePopup) {
@@ -711,7 +711,7 @@ int gameLoop (
return 1;
}
void gameLoop_processMovement (Inputs *inputs) {
void gameLoop_processMovement (Inputs *inputs, int inWater) {
// Only process movement controls if there are no active popup
if (gamePopup == 0) {
// Looking around
@@ -745,16 +745,25 @@ void gameLoop_processMovement (Inputs *inputs) {
if (player.vRot < -1.57) player.vRot = -1.57;
if (player.vRot > 1.57) player.vRot = 1.57;
float speed = 0.02;
if (inWater) speed = 0.0013;
player.FBVelocity =
(inputs->keyboard.w - inputs->keyboard.s) * 0.02;
(inputs->keyboard.w - inputs->keyboard.s) * speed;
player.LRVelocity =
(inputs->keyboard.d - inputs->keyboard.a) * 0.02;
(inputs->keyboard.d - inputs->keyboard.a) * speed;
}
// Moving around
playerMovement.x *= 0.5;
playerMovement.y *= 0.99;
playerMovement.z *= 0.5;
if (inWater) {
playerMovement.x *= 0.95;
playerMovement.y *= 0.999;
playerMovement.z *= 0.95;
} else {
playerMovement.x *= 0.5;
playerMovement.y *= 0.99;
playerMovement.z *= 0.5;
}
playerMovement.x +=
player.vectorH.x * player.FBVelocity +
@@ -762,7 +771,11 @@ void gameLoop_processMovement (Inputs *inputs) {
playerMovement.z +=
player.vectorH.y * player.FBVelocity -
player.vectorH.x * player.LRVelocity;
playerMovement.y += 0.003;
if (inWater) {
playerMovement.y += 0.0003;
} else {
playerMovement.y += 0.003;
}
// detect collisions
for (int axis = 0; axis < 3; axis++) {
@@ -782,13 +795,17 @@ void gameLoop_processMovement (Inputs *inputs) {
}
if (
inputs->keyboard.space > 0 &&
(playerMovement.y > 0.0) &!
gamePopup
(playerMovement.y > 0.0) &&
!gamePopup
) {
inputs->keyboard.space = 0;
playerMovement.y = -0.1;
if (inWater) {
playerMovement.y = -0.03;
} else {
playerMovement.y = -0.1;
}
goto label208;
}
}
playerMovement.y = 0.0;
goto label208;
}

2
src/gameloop.h
View File

@@ -6,6 +6,6 @@
#include "player.h"
int gameLoop (Inputs *inputs, SDL_Renderer *renderer);
void gameLoop_processMovement (Inputs *);
void gameLoop_processMovement (Inputs *, int);
void gameLoop_resetGame ();
void gameLoop_error (char *);

3
src/terrain.c
View File

@@ -556,6 +556,7 @@ void ch_genDev (Block *blocks, int xOffset, int yOffset, int zOffset) {
for (int x = 0; x < CHUNK_SIZE; x ++)
for (int z = 0; z < CHUNK_SIZE; z ++) {
ch_setBlock(blocks, x, 3, z, BLOCK_WATER, 1);
ch_setBlock(blocks, x, 3, z, BLOCK_PLAYER_HEAD, 1);
ch_setBlock(blocks, x, 4, z, BLOCK_PLAYER_BODY, 1);
}
}