Revert Issue #4

CMakeLists.txt

@@ -48,3 +48,31 @@ if(MINGW)
         ${GLFW_LIBRARIES} ${CURL_LIBRARIES})
 endif()
 
+# GTest setup
+# do not want main included so it is a valid executable
+#MESSAGE(STATUS "${SOURCE_FILES}")
+FOREACH(item ${SOURCE_FILES})
+  IF(${item} MATCHES "src/main.c")
+    LIST(REMOVE_ITEM SOURCE_FILES ${item})
+  ENDIF(${item} MATCHES "src/main.c")
+ENDFOREACH(item)
+#MESSAGE(STATUS "${SOURCE_FILES}")
+
+enable_testing()
+find_package(GTest REQUIRED)
+include_directories(${GTEST_INCLUDE_DIR})
+add_executable(
+    runTests 
+    tests/tests.cpp 
+    ${SOURCE_FILES}
+    deps/glew/src/glew.c
+    deps/lodepng/lodepng.c
+    deps/noise/noise.c
+    deps/sqlite/sqlite3.c
+    deps/tinycthread/tinycthread.c)
+target_link_libraries(runTests 
+    ${GTEST_BOTH_LIBRARIES} 
+    pthread
+    dl glfw
+    ${GLFW_LIBRARIES} 
+    ${CURL_LIBRARIES} )

src/config.h

@@ -43,10 +43,14 @@
 #define CRAFT_KEY_COMMAND '/'
 #define CRAFT_KEY_SIGN '`'
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #define CRAFT_KEY_RUN GLFW_KEY_LEFT_CONTROL
 >>>>>>> f8dd1648b873dd56a2e1f769594e6103784dc435
 
+=======
+#define CRAFT_KEY_RUN GLFW_KEY_LEFT_CONTROL
+>>>>>>> parent of 15dbf4a (Revert 'Resolved Issue #4')
 // advanced parameters
 #define CREATE_CHUNK_RADIUS 10
 #define RENDER_CHUNK_RADIUS 10

src/main.c

@@ -2431,22 +2431,25 @@ void handle_movement(double dt) {
     State *s = &g->players->state;
     int sz = 0;
     int sx = 0;
+    int isRunning = 0;
     if (!g->typing) {
         float m = dt * 1.0;
         g->ortho = glfwGetKey(g->window, CRAFT_KEY_ORTHO) ? 64 : 0;
         g->fov = glfwGetKey(g->window, CRAFT_KEY_ZOOM) ? 15 : 65;
-<<<<<<< HEAD
         if (glfwGetKey(g->window, CRAFT_KEY_FORWARD)) {
             if(glfwGetKey(g->window, CRAFT_KEY_RUN)) isRunning = 1;
             sz--;
 <<<<<<< HEAD
         }       
+<<<<<<< HEAD
 =======
         if (glfwGetKey(g->window, CRAFT_KEY_FORWARD)) sz--;
 >>>>>>> parent of 6ca5a52 (issue #4)
 =======
         } 
 >>>>>>> f8dd1648b873dd56a2e1f769594e6103784dc435
+=======
+>>>>>>> parent of 15dbf4a (Revert 'Resolved Issue #4')
         if (glfwGetKey(g->window, CRAFT_KEY_BACKWARD)) sz++;
         if (glfwGetKey(g->window, CRAFT_KEY_LEFT)) sx--;
         if (glfwGetKey(g->window, CRAFT_KEY_RIGHT)) sx++;
@@ -2470,12 +2473,13 @@ void handle_movement(double dt) {
 <<<<<<< HEAD
     float speed = g->flying ? 20 : 5;
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     float speed = g->flying ? g->flying_sprint_speed : 5; // flying gets modifiable speed
 >>>>>>> f8dd1648b873dd56a2e1f769594e6103784dc435
-    if(isRunning) speed*=1.5;
 =======
->>>>>>> parent of 6ca5a52 (issue #4)
+>>>>>>> parent of 15dbf4a (Revert 'Resolved Issue #4')
+    if(isRunning) speed*=1.5;
     int estimate = roundf(sqrtf(
         powf(vx * speed, 2) +
         powf(vy * speed + ABS(dy) * 2, 2) +