From 9cbaa9d14bffa58c89c40d6f70ba44ce93f3404f Mon Sep 17 00:00:00 2001 From: SuperErnD Date: Sat, 27 Jul 2024 15:35:13 +0300 Subject: [PATCH] ci fix and edits --- .github/workflows/ci_build.yml | 13 ++++++------- api/src/connect.v | 2 +- client/src/screens/menu.v | 5 ++--- server/src/main.v | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml index 71332d0..94939bd 100644 --- a/.github/workflows/ci_build.yml +++ b/.github/workflows/ci_build.yml @@ -21,13 +21,9 @@ jobs: - name: Setup vlang uses: vlang/setup-v@v1.4 - - - name: Raylib depends - run: sudo apt-get install -y libasound2-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libxcursor-dev libxinerama-dev libwayland-dev libxkbcommon-dev - - - name: Build raylib - working-directory: ./client - run: make + + - name: Chronic depends + run: v install SuperErnD.cn - name: Build production working-directory: ./client @@ -70,6 +66,9 @@ jobs: - name: Setup vlang uses: vlang/setup-v@v1.4 + - name: Chronic depends + run: v install SuperErnD.cn + - name: Build production working-directory: client run: v -cc msvc -autofree -prod . diff --git a/api/src/connect.v b/api/src/connect.v index 217d27f..1b2c968 100644 --- a/api/src/connect.v +++ b/api/src/connect.v @@ -19,7 +19,7 @@ pub fn (mut app App) initiate_connect(mut ctx Context) veb.Result { nonce: cn.generate_random(24) key: base64.decode(app.private_token_key) exp: time.now().unix_milli() + 30 * 1000 + 1000 * app.game_servers.len - protocol_id: 0xdeaddeaddeaddead + protocol_id: 0xdeadbeef timeout: 1 s2c_key: cn.generate_random(32) c2s_key: cn.generate_random(32) diff --git a/client/src/screens/menu.v b/client/src/screens/menu.v index 671bb9d..3857c76 100644 --- a/client/src/screens/menu.v +++ b/client/src/screens/menu.v @@ -52,14 +52,13 @@ pub fn (mut ms MenuScreen) join(mut ctx types.Context) { ms.generic_error_handler(mut ctx, err) return } - - println(token) (*network.gmanager).connect(token) or { // trash code - log.error("Failed to connect!") ms.generic_error_handler(mut ctx, err) return } + + log.info("yay! connected to server over chronic-network") } pub fn (mut ms MenuScreen) draw(delta f32, mut ctx types.Context) ! { diff --git a/server/src/main.v b/server/src/main.v index 88db019..d852c92 100644 --- a/server/src/main.v +++ b/server/src/main.v @@ -37,7 +37,7 @@ fn main() { mut srv := cn.Server{ key: key - protocol_id: 0xdeaddeaddeaddead + protocol_id: 0xdeadbeef } // ПОДНЯТЬ СЕРВЕР НА НОГИ ЕСЛИ НЕ ПИДОР