Rtch/bettola
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] Add single-player mode.

Browse Source
This commit is contained in:
Ritchie Cunningham 2025-09-27 00:34:38 +01:00
parent fde6879720
commit 2c01d53b9d
3 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/CMakeLists.txt
View File

@ -1,16 +1,25 @@
file(GLOB_RECURSE CLIENT_SOURCES "src/*.cpp")
# Explicitly list server sources needed for single-player to avoid main() conflict.
set(SERVER_SOURCES
"../server/src/network_manager.cpp"
"../server/src/player.cpp"
)
add_executable(bettolac
${CLIENT_SOURCES}
${SERVER_SOURCES}
)
find_package(SDL3 REQUIRED)
find_package(GLEW REQUIRED)
find_package(OpenGL REQUIRED)
find_package(Freetype REQUIRED)
find_package(Threads REQUIRED)
target_link_libraries(bettolac PRIVATE bettola SDL3::SDL3 ${GLEW_LIBRARIES}
${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} Threads::Threads)
target_include_directories(bettolac PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
# Add server include dir for single player mode.
${CMAKE_SOURCE_DIR}/server/src
${GLEW_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})

32
client/src/main.cpp
View File

@ -4,14 +4,46 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_keyboard.h>
/* For single player mode. */
#include <random>
#include <string>
#include <thread>
#include <chrono>
#include "../../server/src/network_manager.h"
#include "terminal.h"
#include "gfx/shape_renderer.h"
#include "ui/desktop.h"
#include "ui/ui_window.h"
void run_server(void) {
try {
NetworkManager server;
server.start(1337);
/*
* Server's start() method is non-blocking, but NetworkManager
* object must be kept alive. We'll just loop forever and let the OS
* clean up the thread when main exits ;)
*/
while(true) {
std::this_thread::sleep_for(std::chrono::seconds(5));
}
} catch(const std::exception& e) {
fprintf(stderr, "Single-player server thread exception: %s\n", e.what());
}
}
const int SCREEN_WIDTH = 1280;
const int SCREEN_HEIGHT = 720;
int main(int argc, char** argv) {
if(argc > 1 && std::string(argv[1]) == "-sp") {
fprintf(stdout, "Starting in single-player mode...\n");
std::thread server_thread(run_server);
server_thread.detach();
fprintf(stdout, "Waiting for server initialise...\n");
std::this_thread::sleep_for(std::chrono::milliseconds(200));
}
/* Init SDL. */
if(!SDL_Init(SDL_INIT_VIDEO)) {
printf("SDL could not initialise! SDL_ERROR: %s\n", SDL_GetError());

9
client/src/terminal.cpp
View File

@ -4,7 +4,6 @@
#include <GL/glew.h>
#include <SDL3/SDL_events.h>
#include <sstream>
#include <algorithm>
#include "terminal.h"
#include "client_network.h"
@ -15,10 +14,10 @@ Terminal::Terminal(void) {
_history.push_back("Welcome to Bettola");
_history.push_back("Connecting to server...");
_network = std::make_unique<ClientNetwork>();
_should_close = false;
_scroll_offset = 0;
_prompt = "";
_network = std::make_unique<ClientNetwork>();
_should_close = false;
_scroll_offset = 0;
_prompt = "";
/* TODO: Move network to main.cpp, or better yet, a dedicatated game state file */
if(_network->connect("127.0.0.1", 1337)) {