0.4.3

- Fixed some Makefile issues - Makefile improvements - Fixed some windowing bugs - Added server event timers - Server now displays more info when starting/stopping - Renderer stops before server - Changed config file from ~/.cavecube/cavecube.cfg to ~/.cavecube/config.cfg - Changed local folder from %AppData%\cavecube\ to %AppData%\.cavecube\ on Windows - More folders are created in the local folder
PQCraft · Oct 8, 2022 · e17399e · e17399e
1 parent ee33518
commit e17399e
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 49 deletions.
diff --git a/src/common/common.c b/src/common/common.c
@@ -183,6 +183,15 @@ bool rm(char* path) {
 }
 
 bool md(char* path) {
+    switch (isFile(path)) {
+        case 0:;
+            return true;
+            break;
+        case 1:;
+            fprintf(stderr, "'%s' is not a directory\n", path);
+            return false;
+            break;
+    }
     char tmp[MAX_PATH];
     char *ptr = NULL;
     size_t len;
@@ -192,7 +201,7 @@ bool md(char* path) {
     for (ptr = tmp + 1; *ptr; ++ptr) {
         if (*ptr == '/' || *ptr == PATHSEP) {
             *ptr = 0;
-            if (mkdir(tmp)) return false;
+            mkdir(tmp);
             *ptr = PATHSEP;
         }
     }

diff --git a/src/main/main.c b/src/main/main.c
@@ -119,56 +119,9 @@ int main(int _argc, char** _argv) {
     #endif
     argc = _argc;
     argv = _argv;
-    maindir = strdup(pathfilename(execpath()));
-    startdir = realpath(".", NULL);
-    MAIN_STRPATH(startdir);
-    #ifndef SERVER
-    {
-        #ifndef _WIN32
-        char* tmpdir = getenv("HOME");
-        char* tmpdn = ".cavecube";
-        #else
-        char* tmpdir = getenv("AppData");
-        char* tmpdn = "cavecube";
-        #endif
-        if (!altchdir(tmpdir)) return 1;
-        switch (isFile(tmpdn)) {
-            case -1:;
-                mkdir(tmpdn);
-                break;
-            case 1:;
-                fprintf(stderr, "'%s' is not a directory\n", tmpdn);
-                return 1;
-                break;
-        }
-        if (!altchdir(tmpdn)) return 1;
-        localdir = realpath(".", NULL);
-        MAIN_STRPATH(localdir);
-    }
-    strcpy(configpath, localdir);
-    strcat(configpath, "config.cfg");
-    bool chconfig = false;
-    #else
-    strcpy(configpath, "ccserver.cfg");
-    #endif
-    #if DBGLVL(1)
-    printf("Main directory: {%s}\n", maindir);
-    printf("Start directory: {%s}\n", startdir);
-    #ifndef SERVER
-    printf("Local directory: {%s}\n", localdir);
-    #endif
-    #endif
-    if (!altchdir(maindir)) return 1;
-    signal(SIGINT, sigh);
-    #ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
-    #else
-    signal(SIGSEGV, sigsegvh);
-    #endif
-    int cores = getCoreCt();
-    if (cores < 1) cores = 1;
     #ifndef SERVER
     int gametype = -1;
+    bool chconfig = false;
     bool servopt = false;
     struct {
         char* world;
@@ -303,6 +256,47 @@ int main(int _argc, char** _argv) {
             return 1;
         }
     }
+    maindir = strdup(pathfilename(execpath()));
+    startdir = realpath(".", NULL);
+    MAIN_STRPATH(startdir);
+    #ifndef SERVER
+    {
+        #ifndef _WIN32
+        char* tmpdir = getenv("HOME");
+        #else
+        char* tmpdir = getenv("AppData");
+        #endif
+        char tmpdn[MAX_PATH] = "";
+        strcpy(tmpdn, tmpdir);
+        strcat(tmpdn, "/.cavecube");
+        if (!md(tmpdn)) return 1;
+        if (!altchdir(tmpdn)) return 1;
+        if (!md("worlds")) return 1;
+        if (!md("resources")) return 1;
+        localdir = realpath(".", NULL);
+        MAIN_STRPATH(localdir);
+    }
+    strcpy(configpath, localdir);
+    strcat(configpath, "config.cfg");
+    #else
+    strcpy(configpath, "ccserver.cfg");
+    #endif
+    #if DBGLVL(1)
+    printf("Main directory: {%s}\n", maindir);
+    printf("Start directory: {%s}\n", startdir);
+    #ifndef SERVER
+    printf("Local directory: {%s}\n", localdir);
+    #endif
+    #endif
+    if (!altchdir(maindir)) return 1;
+    signal(SIGINT, sigh);
+    #ifndef _WIN32
+    signal(SIGPIPE, SIG_IGN);
+    #else
+    signal(SIGSEGV, sigsegvh);
+    #endif
+    int cores = getCoreCt();
+    if (cores < 1) cores = 1;
     #if DBGLVL(1)
     printf("Config path: {%s}\n", configpath);
     #endif

diff --git a/src/server/network.c b/src/server/network.c
@@ -28,6 +28,7 @@
     #define PRIsock PRIu64
     #define SOCKINVAL(s) ((s) == INVALID_SOCKET)
     #define SOCKERR(x) ((x) == SOCKET_ERROR)
+    #define in_addr_t uint32_t
     static WSADATA wsadata;
     static WORD wsaver = MAKEWORD(2, 2);
     static bool wsainit = false;