From c6d9a2cd777aab63031fd462be167e4603c189ab Mon Sep 17 00:00:00 2001
From: tovjemam <zbyvaj@seznam.cz>
Date: Sat, 14 Mar 2026 20:31:48 +0100
Subject: [PATCH] Version check & login form init

---
 shell.html                      | 39 +++++++++++++++++++--
 src/client/app.hpp              |  4 +++
 src/client/main.cpp             | 60 ++++++++++++++++++++++++++++-----
 src/game/openworld.cpp          |  2 +-
 src/game/player.cpp             |  2 +-
 src/game/player.hpp             |  4 ++-
 src/game/player_character.cpp   |  2 ++
 src/gameview/client_session.cpp |  5 +--
 src/net/defs.hpp                |  6 +++-
 src/server/client.cpp           | 49 +++++++++++++++++++++++----
 src/server/client.hpp           |  6 +++-
 src/server/server.cpp           | 10 ++++--
 src/server/server.hpp           |  2 ++
 src/server/wsserver.cpp         | 18 ++++++++--
 src/server/wsserver.hpp         |  2 +-
 src/utils/version.hpp           |  3 ++
 16 files changed, 184 insertions(+), 30 deletions(-)
 create mode 100644 src/utils/version.hpp
diff --git a/shell.html b/shell.html
index 347c9f3..810e936 100644
--- a/shell.html
+++ b/shell.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>PortalGame</title>
+    <title>Fekalni gtacko</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
     <style>
@@ -14,6 +14,7 @@
             overflow: hidden;
             height: 100%;
             background: black;
+            color: aqua;
         }
 
         canvas {
@@ -25,15 +26,30 @@
 </head>
 
 <body>
-    <canvas id="canvas" oncontextmenu="event.preventDefault()"></canvas>
+    <canvas id="canvas" oncontextmenu="event.preventDefault()" style="display:none"></canvas>
+
+    <div id="loginform">
+        <h1>fekální gtačko</h1>
+
+        <form>
+            kdo <input type="text" name="name" id="name"><br>
+            kam <input type="text" name="url" id="url"><br>
+            <input type="button" value="0k" onclick="ok()">
+        </form>
+    </div>
 
     <script>
+        var inited = false;
+
         var Module = {
             preRun: [],
             postRun: [],
             canvas: (function() {
             return document.getElementById('canvas');
-            })()
+            })(),
+            onRuntimeInitialized: function() {
+                inited = true;
+            }
         };
 
         // Resize canvas to fit the window and inform SDL (via Emscripten)
@@ -51,6 +67,23 @@
 
         window.addEventListener('resize', resizeCanvas);
         window.addEventListener('load', resizeCanvas);
+
+        function ok()
+        {
+            if (!inited)
+                return;
+
+            const name = document.getElementById("name").value;
+            const url = document.getElementById("url").value;
+        
+            Module.ccall("SetName", name);
+            Module.ccall("SetUrl", url);
+
+            document.getElementById("loginform").style = "display:none";
+            document.getElementById("canvas").style = "";
+
+            Module.ccall("RunMain");
+        }
     </script>
 
     {{{ SCRIPT }}}
diff --git a/src/client/app.hpp b/src/client/app.hpp
index c814f32..dfeae61 100644
--- a/src/client/app.hpp
+++ b/src/client/app.hpp
@@ -34,6 +34,9 @@ public:
     void SetTime(float time) { time_ = time; }
     void SetViewportSize(int width, int height) { viewport_size_ = {width, height}; }
 
+    void SetUserName(const std::string& username) { username_ = username; }
+    const std::string& GetUserName() const { return username_; }
+
     void Input(game::PlayerInputType in, bool pressed, bool repeated);
     void MouseMove(const glm::vec2& delta);
 
@@ -71,6 +74,7 @@ private:
 
     audio::Master audiomaster_;
 
+    std::string username_;
     std::unique_ptr<game::view::ClientSession> session_;
 
     std::deque<ChatMessage> chat_;
diff --git a/src/client/main.cpp b/src/client/main.cpp
index e8ac182..0f1de7b 100644
--- a/src/client/main.cpp
+++ b/src/client/main.cpp
@@ -28,11 +28,20 @@
 #include "app.hpp"
 #include "gl.hpp"
 
+static std::string s_username;
+static std::string s_url;
+
 static SDL_Window *s_window = nullptr;
 static SDL_GLContext s_context = nullptr;
 static bool s_quit = false;
 static std::unique_ptr<App> s_app;
 
+struct ClientConfig
+{
+    std::string username;
+    std::string url;
+};
+
 static void ThrowSDLError(const std::string& message)
 {
     std::string error = SDL_GetError();
@@ -66,7 +75,7 @@ static void InitSDL()
 
 	std::cout << "Creating SDL window..." << std::endl;
     s_window =
-        SDL_CreateWindow("PortalGame", 100, 100, 640, 480,
+        SDL_CreateWindow("Fekalni gtacko", 100, 100, 640, 480,
                          SDL_WINDOW_SHOWN /* | SDL_WINDOW_MAXIMIZED */| SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
     if (!s_window)
     {
@@ -384,7 +393,10 @@ static void Frame()
 }
 
 static void Main() {
-    if (!WSInit(WS_URL))
+    if (s_url.empty())
+        s_url = WS_URL;
+
+    if (!WSInit(s_url.c_str()))
         return;
 
     InitSDL();
@@ -401,8 +413,10 @@ static void Main() {
 
     SDL_SetRelativeMouseMode(SDL_TRUE);
 
+
     s_app = std::make_unique<App>();
-    s_app->AddChatMessagePrefix("WebSocket", "připojování na " + std::string(WS_URL));
+    s_app->SetUserName(s_username);
+    s_app->AddChatMessagePrefix("WebSocket", "připojování na " + s_url);
 
 #ifdef EMSCRIPTEN
     emscripten_set_main_loop(Frame, 0, true);
@@ -429,7 +443,7 @@ static void Main() {
             std::this_thread::sleep_for(t_next - t_now);
         }
     }
-        
+
     s_app.reset();
 
     ShutdownGL();
@@ -439,7 +453,10 @@ static void Main() {
 #endif // EMSCRIPTEN
 }
 
-int main(int argc, char *argv[])
+extern "C"
+{
+
+void RunMain()
 {
     try {
         Main();
@@ -447,8 +464,35 @@ int main(int argc, char *argv[])
     catch (const std::exception& e) {
         std::cerr << "[ERROR] " << e.what() << std::endl;
         SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", e.what(), nullptr);
-        return EXIT_FAILURE;
     }
-
-	return EXIT_SUCCESS;
 }
+
+void SetName(const char* name)
+{
+    s_username = name;
+}
+
+void SetUrl(const char* url)
+{
+    s_url = url;
+}
+
+}
+
+#ifndef EMSCRIPTEN
+
+int main(int argc, char *argv[])
+{
+    SetName("random guvno");
+    RunMain();
+	return 0;
+}
+
+#else
+
+int main(int argc, char *argv[])
+{
+
+}
+
+#endif
diff --git a/src/game/openworld.cpp b/src/game/openworld.cpp
index 19628c6..3cf378a 100644
--- a/src/game/openworld.cpp
+++ b/src/game/openworld.cpp
@@ -173,7 +173,7 @@ void game::OpenWorld::CreatePlayerCharacter(Player& player)
     RemovePlayerCharacter(player);
 
     auto& character = SpawnRandomCharacter<PlayerCharacter>(*this, player);
-    character.SetNametag("player (" + std::to_string(character.GetEntNum()) + ")");
+    // character.SetNametag("player (" + std::to_string(character.GetEntNum()) + ")");
     character.SetPosition({100.0f, 100.0f, 5.0f});
 
     player_characters_[&player] = &character;
diff --git a/src/game/player.cpp b/src/game/player.cpp
index 4375b6a..de4e9b6 100644
--- a/src/game/player.cpp
+++ b/src/game/player.cpp
@@ -65,7 +65,7 @@ void game::Player::SetCamera(net::EntNum entnum)
     msg.Write(entnum);
 }
 
-void game::Player::SendChat(const std::string text)
+void game::Player::SendChat(const std::string& text)
 {
     auto msg = BeginMsg(net::MSG_CHAT);
     net::ChatMessage chatm = text;
diff --git a/src/game/player.hpp b/src/game/player.hpp
index de72609..501d9a5 100644
--- a/src/game/player.hpp
+++ b/src/game/player.hpp
@@ -28,7 +28,9 @@ public:
     void SetWorld(std::shared_ptr<World> world);
 
     void SetCamera(net::EntNum entnum);
-    void SendChat(const std::string text);
+    void SendChat(const std::string& text);
+
+    const std::string& GetName() const { return name_; }
 
     PlayerInputFlags GetInput() const { return in_; }
     float GetViewYaw() const { return view_yaw_; }
diff --git a/src/game/player_character.cpp b/src/game/player_character.cpp
index e9a5e47..c6c5687 100644
--- a/src/game/player_character.cpp
+++ b/src/game/player_character.cpp
@@ -5,6 +5,8 @@ game::PlayerCharacter::PlayerCharacter(World& world, OpenWorld& openworld, Playe
 {
     EnablePhysics(true);
     VehicleChanged();
+
+    SetNametag(player.GetName());
 }
 
 void game::PlayerCharacter::Update()
diff --git a/src/gameview/client_session.cpp b/src/gameview/client_session.cpp
index 97d92e8..862f786 100644
--- a/src/gameview/client_session.cpp
+++ b/src/gameview/client_session.cpp
@@ -5,13 +5,14 @@
 // #include <glm/gtx/common.hpp>
 
 #include "vehicleview.hpp"
+#include "utils/version.hpp"
 
 game::view::ClientSession::ClientSession(App& app) : app_(app)
 {
 	// send login
 	auto msg = BeginMsg(net::MSG_ID);
-	net::PlayerName name;
-	msg.Write(name);
+    msg.Write<net::Version>(FEKAL_VERSION);
+	msg.Write(net::PlayerName(app.GetUserName()));
 }
 
 bool game::view::ClientSession::ProcessMessage(net::InMessage& msg)
diff --git a/src/net/defs.hpp b/src/net/defs.hpp
index 6a8d97a..cb2e51c 100644
--- a/src/net/defs.hpp
+++ b/src/net/defs.hpp
@@ -55,7 +55,7 @@ enum MessageType : uint8_t
     MSG_COUNT,
 };
 
-using PlayerName = FixedStr<24>;
+using PlayerName = FixedStr<64>;
 using MapName = FixedStr<32>;
 using ModelName = FixedStr<64>;
 using ChatMessage = FixedStr<1024>;
@@ -131,4 +131,8 @@ using ObjCount = ObjNum;
 
 using NumTexels = uint16_t;
 
+// version
+
+using Version = uint32_t;
+
 } // namespace net
\ No newline at end of file
diff --git a/src/server/client.cpp b/src/server/client.cpp
index 6b6d9bf..8d70254 100644
--- a/src/server/client.cpp
+++ b/src/server/client.cpp
@@ -1,7 +1,10 @@
 #include "client.hpp"
 
+#include <format>
+
 #include "server.hpp"
 #include "utils/validate.hpp"
+#include "utils/version.hpp"
 
 sv::Client::Client(Server& server, WSConnId id) : server_(server), id_(id) {}
 
@@ -31,13 +34,7 @@ bool sv::Client::ProcessSingleMessage(net::MessageType type, net::InMessage& msg
         if (type != net::MSG_ID)
             return false;
         
-        net::PlayerName name;
-        if (!msg.Read(name) || !utils::IsAlphanumeric(name))
-            return false;
-            
-        player_ = std::make_unique<game::Player>(server_.GetGame(), name);
-        state_ = CS_PLAYER;
-        return true;
+        return ProcessLoginMsg(msg);
     }
 
     return false;
@@ -58,7 +55,45 @@ void sv::Client::Update()
     }
 }
 
+void sv::Client::SendChat(const std::string& text)
+{
+    // not buffering till update here (unlike in Player), sent instantly
+    static std::vector<char> msg_buf;
+    msg_buf.clear();
+    net::OutMessage msg(msg_buf);
+    msg.Write(net::MSG_CHAT);
+    msg.Write(net::ChatMessage(text));
+
+    Send(std::string(msg_buf.data(), msg_buf.size()));
+}
+
+void sv::Client::Disconnect()
+{
+    server_.Disconnect(*this);
+}
+
 void sv::Client::Send(std::string msg)
 {
     server_.Send(*this, std::move(msg));
 }
+
+bool sv::Client::ProcessLoginMsg(net::InMessage& msg)
+{
+    net::Version ver = 0;
+    msg.Read(ver);
+    
+    // check ver
+    if (ver != FEKAL_VERSION)
+    {
+        SendChat(std::format("^f55špatná verze {}, server je na verzi {}", ver, FEKAL_VERSION));
+        return false;
+    }
+
+    net::PlayerName name;
+    if (!msg.Read(name) || !utils::IsAlphanumeric(name))
+        return false;
+    
+    player_ = std::make_unique<game::Player>(server_.GetGame(), name);
+    state_ = CS_PLAYER;
+    return true;
+}
diff --git a/src/server/client.hpp b/src/server/client.hpp
index f93f20b..d990314 100644
--- a/src/server/client.hpp
+++ b/src/server/client.hpp
@@ -28,7 +28,9 @@ public:
 
     void Update();
 
-    // void Disconnect(const std::string& reason);
+    void SendChat(const std::string& text);
+
+    void Disconnect();
 
     WSConnId GetConnId() const { return id_; }
     ClientState GetState() const { return state_; }
@@ -39,6 +41,8 @@ public:
 private:
     void Send(std::string msg);
 
+    bool ProcessLoginMsg(net::InMessage& msg);
+
 private:
     Server& server_;
     WSConnId id_ = 0;
diff --git a/src/server/server.cpp b/src/server/server.cpp
index a1f7d42..253079f 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -61,6 +61,11 @@ void sv::Server::Send(Client& client, std::string msg)
     ws_.Send(client.GetConnId(), std::move(msg));
 }
 
+void sv::Server::Disconnect(Client& client)
+{
+    ws_.Close(client.GetConnId());
+}
+
 void sv::Server::PollWSEvents()
 {
     WSEvent event;
@@ -98,9 +103,10 @@ void sv::Server::HandleWSConnect(WSConnId conn)
 void sv::Server::HandleWSMessage(WSConnId conn, const std::string& data)
 {
     net::InMessage msg(data.data(), data.size());
-    if (!clients_.at(conn)->ProcessMessage(msg))
+    auto& client = clients_.at(conn);
+    if (!client->ProcessMessage(msg))
     {
-        // TODO: disconnect
+        client->Disconnect();
     }    
 }
 
diff --git a/src/server/server.hpp b/src/server/server.hpp
index 1a4c689..6b131c1 100644
--- a/src/server/server.hpp
+++ b/src/server/server.hpp
@@ -21,6 +21,8 @@ public:
 
     void Send(Client& client, std::string msg);
 
+    void Disconnect(Client& client);
+
     game::Game& GetGame() { return game_; }
 
     int64_t GetTime() const { return time_; }
diff --git a/src/server/wsserver.cpp b/src/server/wsserver.cpp
index 00e263c..ef625eb 100644
--- a/src/server/wsserver.cpp
+++ b/src/server/wsserver.cpp
@@ -86,17 +86,31 @@ bool sv::WSServer::PollEvent(WSEvent& out_event)
 void sv::WSServer::Send(WSConnId conn_id, std::string data)
 {
     std::lock_guard<std::mutex> lock(mtx_);
-
+    
     auto it = id2conn_.find(conn_id);
     if (it == id2conn_.end())
     {
         std::cerr << "attempted to send message to unknown conn ID " << conn_id << std::endl;
         return;
     }
-
+    
     (*it->second).send_binary(std::move(data));
 }
 
+void sv::WSServer::Close(WSConnId conn_id)
+{
+    std::lock_guard<std::mutex> lock(mtx_);
+
+    auto it = id2conn_.find(conn_id);
+    if (it == id2conn_.end())
+    {
+        std::cerr << "attempted to close unknown conn ID " << conn_id << std::endl;
+        return;
+    }
+    
+    (*it->second).close();
+}
+
 void sv::WSServer::Exit()
 {
     std::lock_guard<std::mutex> lock(mtx_);
diff --git a/src/server/wsserver.hpp b/src/server/wsserver.hpp
index cd81d39..11e3494 100644
--- a/src/server/wsserver.hpp
+++ b/src/server/wsserver.hpp
@@ -50,7 +50,7 @@ public:
 
     bool PollEvent(WSEvent& out_event);
     void Send(WSConnId conn_id, std::string data);
-    // void Close(WSConnId conn_id);
+    void Close(WSConnId conn_id);
 
     void Exit();
 
diff --git a/src/utils/version.hpp b/src/utils/version.hpp
new file mode 100644
index 0000000..d7bd25b
--- /dev/null
+++ b/src/utils/version.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#define FEKAL_VERSION 2026031401
