gamestate: Reserve some game entity IDs for internal use.

This allows using 0 in the ID texture as respresentation for "no entity".

Author: heinezen

libopenage/gamestate/entity_factory.cpp

@@ -110,8 +110,6 @@ std::shared_ptr<activity::Activity> create_test_activity() {
 }
 
 EntityFactory::EntityFactory() :
-	next_entity_id{0},
-	next_player_id{0},
 	render_factory{nullptr} {
 }
 

libopenage/gamestate/entity_factory.h

@@ -1,4 +1,4 @@
-// Copyright 2023-2024 the openage authors. See copying.md for legal info.
+// Copyright 2023-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 
@@ -118,13 +118,17 @@ class EntityFactory {
 
 	/**
 	 * ID of the next game entity to be created.
+	 *
+	 * IDs 0-99 are reserved.
 	 */
-	entity_id_t next_entity_id;
+	entity_id_t next_entity_id = 100;
 
 	/**
 	 * ID of the next player to be created.
+	 *
+	 * ID 0 is reserved.
 	 */
-	player_id_t next_player_id;
+	player_id_t next_player_id = 1;
 
 	/**
 	 * Factory for creating connector objects to the renderer which make game entities displayable.

libopenage/gamestate/event/drag_select.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023-2023 the openage authors. See copying.md for legal info.
+// Copyright 2023-2025 the openage authors. See copying.md for legal info.
 
 #include "drag_select.h"
 
@@ -32,7 +32,7 @@ void DragSelectHandler::invoke(openage::event::EventLoop & /* loop */,
                                const param_map &params) {
 	auto gstate = std::dynamic_pointer_cast<openage::gamestate::GameState>(state);
 
-	size_t controlled_id = params.get("controlled", 0);
+	auto controlled_id = params.get<player_id_t>("controlled", 0);
 
 	Eigen::Matrix4f id_matrix = Eigen::Matrix4f::Identity();
 	Eigen::Matrix4f cam_matrix = params.get("camera_matrix", id_matrix);

libopenage/gamestate/event/spawn_entity.cpp

@@ -193,7 +193,7 @@ void SpawnEntityHandler::invoke(openage::event::EventLoop & /* loop */,
 	}
 
 	// Create entity
-	player_id_t owner_id = params.get("owner", 0);
+	auto owner_id = params.get<player_id_t>("owner", 0);
 	auto entity = this->factory->add_game_entity(this->loop, gstate, owner_id, nyan_entity);
 
 	// Setup components

libopenage/input/controller/game/controller.cpp

@@ -24,21 +24,21 @@
 
 namespace openage::input::game {
 
-Controller::Controller(const std::unordered_set<size_t> &controlled_factions,
-                       size_t active_faction_id) :
+Controller::Controller(const std::unordered_set<gamestate::player_id_t> &controlled_factions,
+                       gamestate::player_id_t active_faction_id) :
 	controlled_factions{controlled_factions},
 	active_faction_id{active_faction_id},
 	outqueue{} {}
 
-void Controller::set_control(size_t faction_id) {
+void Controller::set_control(gamestate::player_id_t faction_id) {
 	std::unique_lock lock{this->mutex};
 
 	if (this->controlled_factions.find(faction_id) != this->controlled_factions.end()) {
 		this->active_faction_id = faction_id;
 	}
 }
 
-size_t Controller::get_controlled() const {
+gamestate::player_id_t Controller::get_controlled() const {
 	std::unique_lock lock{this->mutex};
 
 	return this->active_faction_id;

libopenage/input/controller/game/controller.h

@@ -46,8 +46,8 @@ class Controller : public std::enable_shared_from_this<Controller> {
 	 * @param controlled_factions Factions that can be managed by the controller.
 	 * @param active_faction_id Current active faction ID.
 	 */
-	Controller(const std::unordered_set<size_t> &controlled_factions,
-	           size_t active_faction_id);
+	Controller(const std::unordered_set<gamestate::player_id_t> &controlled_factions,
+	           gamestate::player_id_t active_faction_id);
 
 	~Controller() = default;
 
@@ -57,7 +57,7 @@ class Controller : public std::enable_shared_from_this<Controller> {
 	 *
 	 * @param faction_id ID of the new active faction.
 	 */
-	void set_control(size_t faction_id);
+	void set_control(gamestate::player_id_t faction_id);
 
 	/**
 	 * Get the ID of the faction actively controlled by the controller.
@@ -133,12 +133,12 @@ class Controller : public std::enable_shared_from_this<Controller> {
 	/**
 	 * Factions controllable by this controller.
 	 */
-	std::unordered_set<size_t> controlled_factions;
+	std::unordered_set<gamestate::player_id_t> controlled_factions;
 
 	/**
 	 * ID of the currently active faction.
 	 */
-	size_t active_faction_id;
+	gamestate::player_id_t active_faction_id;
 
 	/**
 	 * Currently selected entities.

libopenage/presenter/presenter.cpp

@@ -244,8 +244,8 @@ void Presenter::init_input() {
 		log::log(INFO << "Loading game simulation controls");
 
 		// TODO: Remove hardcoding for controlled/active factions
-		std::unordered_set<size_t> controlled_factions{0, 1, 2, 3};
-		size_t active_faction_id = 0;
+		std::unordered_set<gamestate::player_id_t> controlled_factions{1, 2, 3, 4};
+		gamestate::player_id_t active_faction_id = 1;
 		auto game_controller = std::make_shared<input::game::Controller>(
 			controlled_factions, active_faction_id);