Rename world database to world.sqlite

diff --git a/.gitignore b/.gitignore
index bd82af503d2eb9093135d61d6a0d40fe294ae1e6..6ae23a0bd5f230d51e8fc685a36f78a6a74055f6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,6 @@ CTestTestfile.cmake
 _deps
 DragonblocksServer
 Dragonblocks
-server.sqlite
+world.sqlite
 DragonblocksAlpha-*.zip
 

diff --git a/README.md b/README.md
index 68d97a8f3543566301da183b3956f8fdcb2f411a..77e4abbe93b92f197a89fb15e13ae14038f7ec8b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -32,9 +32,6 @@ or alternatively:
 | F11 | Toggle fullscreen |
 | ESC | Pause / unpause game |
 
-
-Use W, A, S and D to move forward / left / backward / right and Space to jump.
-
 ## Dependencies
 
 The client depends on GLFW3, OpenGL, GLEW and Freetype.
@@ -69,7 +66,7 @@ sudo apt install zlib1g
 ## Usage
 
 ### Server
-The server currently stores all the world files (currently only map.sqlite) in the current working directory, and it will stay like that.
+The server currently stores the world database (world.sqlite) in the current working directory, and it will stay like that.
 If you want to have multiple worlds, just run the DragonblocksServer process from different directories.
 It's up to you how you organize the world folders, which is an advantage since the program really just "does one thing well"
 without having to search your system for share directories or maintaining a world list (like Minetest does).

diff --git a/src/server/server.c b/src/server/server.c
index 73fcfca7778708ff6fcdbbeac502e08cba78c880..c5c8838dd01d0cb1ff87ea23d0a063cc293ffef0 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -75,7 +75,7 @@ static void server_run(int fd)
        pthread_rwlock_init(&server.players_rwlck, NULL);
        server.players = list_create(&list_compare_string);
 
-       server.db = database_open("server.sqlite");
+       server.db = database_open("world.sqlite");
        server_map_init(&server);
 
        while (! interrupted)