diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b224bb9..411d1c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,13 +70,13 @@ jobs: os: windows arch: x86_64 build: .\build.bat - testbin: .\core\out\x64dbg\server.exe + testbin: .\core\out\x64\server.exe - name: Windows (x86) os: windows arch: x86 build: .\build.bat - testbin: .\core\out\x86dbg\server.exe + testbin: .\core\out\x86\server.exe steps: - name: Checkout Core repo @@ -109,6 +109,12 @@ jobs: repository: igor725/cs-worldedit path: cs-worldedit + - name: Checkout Web plugin + uses: actions/checkout@v3 + with: + repository: igor725/cs-web + path: cs-web + - name: Detect MSVC (Windows) uses: ilammy/msvc-dev-cmd@v1 if: ${{matrix.config.os == 'windows'}} @@ -127,7 +133,7 @@ jobs: - name: Build core working-directory: core run: | - ${{matrix.config.build}} wall dbg noprompt + ${{matrix.config.build}} wall noprompt - name: Build plugins working-directory: core @@ -135,10 +141,11 @@ jobs: HOSTCC: ${{matrix.config.hostcc}} MACOSX_DEPLOYMENT_TARGET: "11.0" run: | - ${{matrix.config.build}} wall dbg pb base install && - ${{matrix.config.build}} wall dbg pb survival install && - ${{matrix.config.build}} wall dbg pb worldedit install && - ${{matrix.config.build}} wall dbg pb lua install + ${{matrix.config.build}} wall pb base install && + ${{matrix.config.build}} wall pb survival install && + ${{matrix.config.build}} wall pb worldedit install && + ${{matrix.config.build}} wall pb lua install && + ${{matrix.config.build}} wall pb web install wbuild - name: Make some tests if: ${{matrix.config.testbin != null}} diff --git a/README.md b/README.md index 116e55c..2ce1380 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,6 @@ Notice that these arguments must be passed **after** the `pb` argument and plugi ## Notes * Use this software carefully! The server **may** have many security holes. * At this point, it is strongly recommended to recompile **all plugins** every time you update the server, otherwise your server may crash due to API incompatibility. -* My main OS is Windows 10, this means the Linux thing are not well tested. * By default the server doesn't have any useful chat commands, build the [cs-base](https://github.com/igor725/cs-base) plugin for an expanded command set. * Here is the [example plugin](https://github.com/igor725/cs-test) for this server software. * Your directory should have the following structure in order to compile plugins: diff --git a/src/block.c b/src/block.c index 89dfb27..19c4b57 100644 --- a/src/block.c +++ b/src/block.c @@ -6,7 +6,7 @@ #include "platform.h" #include "list.h" -static cs_str defaultBlockNames[BLOCK_DEFAULT_COUNT] = { +static cs_str const defaultBlockNames[BLOCK_DEFAULT_COUNT] = { "Air", "Stone", "Grass", "Dirt", "Cobblestone", "Wood", "Sapling", "Bedrock", "Water", "Still water", diff --git a/src/main.c b/src/main.c index c469ab5..29e3f81 100644 --- a/src/main.c +++ b/src/main.c @@ -45,10 +45,8 @@ int main(int argc, char *argv[]) { Log_Error("Some tests failed!"); Process_Exit(1); } - } else { - if(Server_Init()) - Server_StartLoop(); - } + } else if(Server_Init()) + Server_StartLoop(); Server_Cleanup(); Compr_Uninit();