Skip to content

Commit

Permalink
ci fix and edits
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperErnD committed Jul 27, 2024
1 parent 8094142 commit 9cbaa9d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/ci_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@ jobs:

- name: Setup vlang
uses: vlang/[email protected]

- 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
Expand Down Expand Up @@ -70,6 +66,9 @@ jobs:
- name: Setup vlang
uses: vlang/[email protected]

- name: Chronic depends
run: v install SuperErnD.cn

- name: Build production
working-directory: client
run: v -cc msvc -autofree -prod .
Expand Down
2 changes: 1 addition & 1 deletion api/src/connect.v
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions client/src/screens/menu.v
Original file line number Diff line number Diff line change
Expand Up @@ -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) ! {
Expand Down
2 changes: 1 addition & 1 deletion server/src/main.v
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fn main() {

mut srv := cn.Server{
key: key
protocol_id: 0xdeaddeaddeaddead
protocol_id: 0xdeadbeef
}

// ПОДНЯТЬ СЕРВЕР НА НОГИ ЕСЛИ НЕ ПИДОР
Expand Down

0 comments on commit 9cbaa9d

Please sign in to comment.