less compactable

schombert · Nov 29, 2024 · 28fa9b3 · 28fa9b3
1 parent 8b309d1
commit 28fa9b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/gamestate/dcon_generated.txt b/src/gamestate/dcon_generated.txt
@@ -2749,7 +2749,7 @@ object {
 }
 relationship{
 	name{ war_participant }
-	storage_type{ compactable }
+	storage_type{ erasable }
 	size{ 3000 }
 	tag{ save }
 
@@ -4318,7 +4318,7 @@ relationship{
 
 object {
 	name { factory }
-	storage_type{ compactable }
+	storage_type{ erasable }
 	size{ 10000 }
 	tag{ save }
 
@@ -4451,7 +4451,7 @@ relationship{
 
 relationship{
 	name{ province_land_construction }
-	storage_type{ compactable }
+	storage_type{ erasable }
 	size{ 16000 }
 	tag{ save }
 
@@ -4487,7 +4487,7 @@ relationship{
 
 relationship{
 	name{ province_naval_construction }
-	storage_type{ compactable }
+	storage_type{ erasable }
 	size{ 16000 }
 	tag{ save }
 
@@ -4523,7 +4523,7 @@ relationship{
 
 relationship{
 	name{ province_building_construction }
-	storage_type{ compactable }
+	storage_type{ erasable }
 	size{ 16000 }
 	tag{ save }
 
@@ -4559,7 +4559,7 @@ relationship{
 
 relationship{
 	name{ state_building_construction }
-	storage_type{ compactable }
+	storage_type{ erasable }
 	size{ 16000 }
 	tag{ save }
 
@@ -5293,7 +5293,7 @@ relationship{
 	}
 	link{
 		object{mp_player}
-		name{player}
+		name{mp_player}
 		type{unique}
 	}
 }

diff --git a/src/gamestate/serialization.hpp b/src/gamestate/serialization.hpp
@@ -151,7 +151,7 @@ inline uint8_t const* deserialize(uint8_t const* ptr_in, ankerl::unordered_dense
 	return ptr_in + sizeof(uint32_t) + sizeof(vec.values()[0]) * length;
 }
 
-constexpr inline uint32_t save_file_version = 42;
+constexpr inline uint32_t save_file_version = 43;
 constexpr inline uint32_t scenario_file_version = 136 + save_file_version;
 
 struct scenario_header {

diff --git a/src/network/network.cpp b/src/network/network.cpp
@@ -661,7 +661,7 @@ dcon::mp_player_id find_mp_player(sys::state& state, sys::player_name name) {
 }
 
 dcon::mp_player_id find_country_player(sys::state& state, dcon::nation_id nation) {
-	return state.world.nation_get_player_from_player_nation(nation);
+	return state.world.nation_get_mp_player_from_player_nation(nation);
 }
 
 static dcon::nation_id get_player_nation(sys::state& state, sys::player_name name, client_data client) {