summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorAldrik Ramaekers <aldrikboy@gmail.com>2024-05-13 20:41:38 +0200
committerAldrik Ramaekers <aldrikboy@gmail.com>2024-05-13 20:41:38 +0200
commit5572dc5c5616c5a7489d55f419c1b630dcc7c8cf (patch)
tree7c8ecfafb08cf3f2db266169194ecb56474567d7 /main.c
parent54f6cfa8e4664a9f12bff327231848f219674e60 (diff)
settings and credits menu work
Diffstat (limited to 'main.c')
-rw-r--r--main.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/main.c b/main.c
index f004750..cb84277 100644
--- a/main.c
+++ b/main.c
@@ -86,17 +86,7 @@ void handle_args(int argc, char **argv) {
}
}
- if (ip && port) {
- if (strcmp(ip, "127.0.0.1") == 0) {
- start_server(port);
- }
- connect_to_server(ip, port);
- }
-
- log_info("STATE: GAMESTATE_PLAYING");
- global_state.state = GAMESTATE_PLAYING;
-
- play_music(music_inside1);
+ connect_to_game(ip, port);
}
int main(int argc, char **argv)
@@ -104,7 +94,10 @@ int main(int argc, char **argv)
platform_init(argc, argv, CONFIG_DIRECTORY);
settings_set_number("USE_GPU", 1);
- platform_window *window = platform_open_window_ex("Zombies!", 1600, 900, 1920, 1080, 500, 500, FLAGS_MINIMIZE, update_func, 0, 0, 0, 0);
+ platform_window *window = platform_open_window_ex("Zombies!",
+ available_resolutions[current_res_index].x,
+ available_resolutions[current_res_index].y,
+ UINT16_MAX, UINT16_MAX, 1366, 768, FLAGS_MINIMIZE, update_func, 0, 0, 0, 0);
platform_toggle_vsync(window, false);
//platform_toggle_fullscreen(window, true);