Forbid reference from writing into rdata

chaserli · chaserli · commit 7d42296f57d9 · 2025-02-28T23:38:33.000+08:00
diff --git a/Helpers/CompileTime.h b/Helpers/CompileTime.h
@@ -38,7 +38,7 @@ struct reference {
 	using value_type = T[Count];
 
 	static const auto Size = Count;
-
+	static_assert(!std::is_reference_v<T> && (std::is_const_v<T> || (Address > 0x812000)));
 	constexpr reference() noexcept = default;
 	reference(reference&) = delete;
 
@@ -93,7 +93,7 @@ struct reference<T, Address, 0> {
 
 	constexpr reference() noexcept = default;
 	reference(reference&) = delete;
-
+	static_assert(!std::is_reference_v<T> && (std::is_const_v<T> || (Address > 0x812000)));
 private:
 	value_type& get() const noexcept {
 		return *reinterpret_cast<value_type*>(Address);
diff --git a/Powerups.h b/Powerups.h
@@ -10,7 +10,7 @@ class Powerups {
 	 */
 
 	// the name of the effect, for INI reading purposes
-	static constexpr reference<const char*, 0x7E523Cu, 19u> const Effects{};
+	static constexpr reference<const char* const, 0x7E523Cu, 19u> const Effects{};
 
 	// the weight of the effect
 	static constexpr reference<int, 0x81DA8Cu, 19u> const Weights{};
diff --git a/Theater.h b/Theater.h
@@ -8,19 +8,19 @@
 struct Theater //US English spelling to keep it consistent with the game
 {
 public:
-	static constexpr reference<Theater, 0x7E1B78u, 6u> const Array {};
+	static constexpr reference<Theater const, 0x7E1B78u, 6u> const Array {};
 
 	static void __fastcall Init(TheaterType theater)
 	{
 		JMP_STD(0x5349C0);
 	}
 
-	static Theater* Get(TheaterType theater)
+	static Theater const* Get(TheaterType theater)
 	{
 		return &Array[static_cast<int>(theater)];
 	}
 
-	static Theater& GetTheater(TheaterType theater)
+	static Theater const& GetTheater(TheaterType theater)
 	{
 		return Array[static_cast<int>(theater)];
 	}
diff --git a/TunnelLocomotionClass.h b/TunnelLocomotionClass.h
@@ -8,7 +8,7 @@ class __declspec(align(4)) NOVTABLE TunnelLocomotionClass : public LocomotionCla
 {
 public:
 	static constexpr uintptr_t ILocoVTable = 0x7F5A24;
-	static constexpr reference<double, 0x7F5B20u> const TunnelMovementSpeed {};
+	static constexpr reference<double const, 0x7F5B20u> const TunnelMovementSpeed {};
 
 	enum State
 	{

Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,19 @@`
`8`	`8`	`struct Theater //US English spelling to keep it consistent with the game`
`9`	`9`	`{`
`10`	`10`	`public:`
`11`		`- static constexpr reference<Theater, 0x7E1B78u, 6u> const Array {};`
	`11`	`+ static constexpr reference<Theater const, 0x7E1B78u, 6u> const Array {};`
`12`	`12`
`13`	`13`	`static void __fastcall Init(TheaterType theater)`
`14`	`14`	`{`
`15`	`15`	`JMP_STD(0x5349C0);`
`16`	`16`	`}`
`17`	`17`
`18`		`- static Theater* Get(TheaterType theater)`
	`18`	`+ static Theater const* Get(TheaterType theater)`
`19`	`19`	`{`
`20`	`20`	`return &Array[static_cast<int>(theater)];`
`21`	`21`	`}`
`22`	`22`
`23`		`- static Theater& GetTheater(TheaterType theater)`
	`23`	`+ static Theater const& GetTheater(TheaterType theater)`
`24`	`24`	`{`
`25`	`25`	`return Array[static_cast<int>(theater)];`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class __declspec(align(4)) NOVTABLE TunnelLocomotionClass : public LocomotionCla`
`8`	`8`	`{`
`9`	`9`	`public:`
`10`	`10`	`static constexpr uintptr_t ILocoVTable = 0x7F5A24;`
`11`		`- static constexpr reference<double, 0x7F5B20u> const TunnelMovementSpeed {};`
	`11`	`+ static constexpr reference<double const, 0x7F5B20u> const TunnelMovementSpeed {};`
`12`	`12`
`13`	`13`	`enum State`
`14`	`14`	`{`