src/entities.c

@@ -111,7 +111,7 @@ void translatePlayer(float dtime, int* hp, int* dmg, entity* ent, cube_0* ret) {
     //printf("(%lf %lf) (%lf %lf) (%lf %lf)\n", vx, camvx, vy, camvy, vz, camvz);
     if(true) {
         double oldvx = camvx;
-        camvx = vx/dtime;
+        camvx += vx/dtime;
         camx -= oldvx*dtime;
         camx += camvx*dtime;
         noResetSpeed = true;
@@ -121,15 +121,15 @@ void translatePlayer(float dtime, int* hp, int* dmg, entity* ent, cube_0* ret) {
         camvy += vy/dtime;
         camy -= oldvy*dtime;
         camy += camvy*dtime;
+        noResetSpeed = true;
     }
     if(true) {
         double oldvz = camvz;
-        camvz = vz/dtime;
+        camvz += vz/dtime;
         camz -= oldvz*dtime;
         camz += camvz*dtime;
         noResetSpeed = true;
     }
-    noFriction = true;
 }
 
 void go_to_player(double x, double y, double z, double w, double h, double d, double hz_angle, double vt_angle, float dtime, entity* ent, cube_0* ret) {

src/main.c

@@ -178,7 +178,6 @@ int main_alt() {
     init_hashtbl();
     init_ent_generator(10);
     init_proj();
-    init_interf();
     parse_rooms(6);
 
     // ---------------------------------------------------------------------------------------------------------------------------------------------- //
@@ -361,7 +360,6 @@ int main_alt() {
 
     hashtbl_free(visited);
     free_proj();
-    free_interf();
     free_pool();
 
     // optional: de-allocate all resources once they've outlived their purpose:

src/menus.c

@@ -131,17 +131,4 @@ void gl_drawInteger(unsigned int fragShader, int n, float x, float y, float size
 
 void gl_initDrawRect(unsigned int shaderProgram) {
     glUseProgram(shaderProgram);
-}
-
-static onoff_button* buttonList;
-static interface* interfaceList;
-
-void init_interf() {
-    buttonList = malloc(sizeof(onoff_button)*256);
-    interfaceList = malloc(sizeof(interface)*64);
-}
-
-void free_interf() {
-    free(buttonList);
-    free(interfaceList);
 }

src/menus.h

@@ -1,33 +1,6 @@
 #ifndef MENUS_H
 #define MENUS_H
 
-typedef enum button_action {WARP, SET_VAR} button_action ;
-
-typedef struct onoff_button {
-    int id;
-
-    char* text;
-    double x; double y; double w; double h;
-    int red;
-    int green;
-    int blue;
-
-    // {WARP, SET_VAR}
-    button_action type;
-    
-    // the value to change (if SET_VAR) or the destination interface (if WARP)
-    int* metadata;
-} onoff_button;
-
-typedef struct interface {
-    int intfid;
-
-    char* title;
-
-    onoff_button* buttons;
-    int nbuttons;
-} interface;
-
 void initMenus();
 
 void gl_drawRect(unsigned int fragShader, float x, float y, float w, float h, int r, int g, int b);
@@ -35,7 +8,4 @@ void gl_initDrawRect(unsigned int shaderProgram);
 
 void gl_drawInteger(unsigned int fragShader, int n, float x, float y, float size, int r, int g, int b, float width, int side);
 
-void init_interf();
-void free_interf();
-
 #endif

src/move.c

@@ -25,7 +25,6 @@ double min_dist = 0.7;
 double friction = 0.8;
 double gravity_factor = 9.8;
 bool noResetSpeed = false;
-bool noFriction = false;
 // ---------------------------------------------------------------------------------------------------- //
 
 int player_hp;
@@ -124,43 +123,34 @@ bool is_colliding(float dtime) {
 void movePlayerG(double dtime) {
     camx += camvx*dtime;
     noResetSpeed = false;
-    noFriction = false;
     if(is_colliding(dtime)) {
         camx -= camvx*dtime;
         if(!noResetSpeed) {
             camvx = 0.0;
         }
     }
-    if(!noFriction) {
+    camvx = camvx*(1-dtime*friction);
-        camvx = camvx*(1-dtime*friction);
-    }
 
     camvy -= gravity_factor*dtime;
     camy += camvy*dtime;
     noResetSpeed = false;
-    noFriction = false;
     if(is_colliding(dtime)) {
         camy -= camvy*dtime;
         if(!noResetSpeed) {
             camvy = 0.0;
         }
     }
-    if(!noFriction) {
+    camvy = camvy*(1-dtime*friction);
-        camvy = camvy*(1-dtime*friction);
-    }
 
     camz += camvz*dtime;
     noResetSpeed = false;
-    noFriction = false;
     if(is_colliding(dtime)) {
         camz -= camvz*dtime;
         if(!noResetSpeed) {
             camvz = 0.0;
         }
     }
-    if(!noFriction) {
+    camvz = camvz*(1-dtime*friction);
-        camvz = camvz*(1-dtime*friction);
-    }
 }
 
 void teleport_on_edge() {

src/structure.h

@@ -148,6 +148,5 @@ extern float rectDefault[18];
 extern int triCount;
 
 extern bool noResetSpeed;
-extern bool noFriction;
 
 #endif