cpp/openttd-patchpack/source Changeset - r26761:5a3d33bc43e3

Changeset - r26761:5a3d33bc43e3

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

Rubidium - 20 months ago 2023-01-14 12:26:17
rubidium@openttd.org

Add: script specific Randomizer instances

5 files changed with 167 insertions and 147 deletions:

regression/regression/result.txt

142

src/genworld.cpp

src/saveload/afterload.cpp

src/script/api/script_object.cpp

src/script/api/script_object.hpp

0 comments (0 inline, 0 general)

regression/regression/result.txt

➞

Show inline comments

@@ @@ -88,24 +88,24 @@ @@
  abs( 21): 21
 --AIBase--
   Rand():       -54346916
   Rand():       -937374575
   Rand():       823953997
   Rand():       -2062310602
   Rand():       -1780331126
   Rand():       -397928569
   RandRange(0): 0
   RandRange(0): 0
   RandRange(0): 0
   RandRange(1): 0
   RandRange(1): 0
   RandRange(1): 0
   RandRange(2): 1
   RandRange(2): 1
   RandRange(2): 1
   RandRange(1000000): 966676
   RandRange(1000000): 289525
   RandRange(1000000): 170283
   RandRange(2): 0
   RandRange(2): 0
   RandRange(2): 0
   RandRange(1000000): 666804
   RandRange(1000000): 624059
   RandRange(1000000): 697029
   Chance(1, 2): true
   Chance(1, 2): false
   Chance(1, 2): true
   Chance(1, 2): false
 --List--
   IsEmpty():     true
@@ @@ -420,144 +420,144 @@ @@
 => 46116
 => 46158
   Randomize ListDump:
 => -200078348
 => -29799264
 => 1630721656
 => 959306175
 => 1527421791
 => 1259692483
 => -1289244298
 => -1572996668
 => -2069479746
 => -1819131606
 => -1007163964
 => -1185394870
 => -1471365065
 => 364354366
 => -1478084253
 => 405281367
 => -11170062
 => 156767750
 => 1288924796
 => 1796884876
 => -1947073702
 => -1999614238
 => -231292809
 => 966621566
 => -606766557
 => -1138727825
 => -749544262
 => 2004771271
 => 686734186
 => 923274744
 => -1672035149
 => -1642064950
 => 1363389551
 => -559500928
 => 1656196991
 => 1655354425
 => -1027156689
 => 1952644328
 => 1217870217
 => 242274100
 => 201816080
 => 2127464758
 => 446043650
 => -319728455
 => 204701002
 => -571265398
 => -1422217131
 => -391208397
 => -1822628371
 => -1499755350
 => -1422137641
 => 1621693134
 => -1428728134
 => -147587573
 => 681719500
 => 1172011190
 => -1834344882
 => 1157634586
 => 1902133676
 => -1967780161
 => -1618025531
 => -810220453
 => 1582854921
 => -410004643
 => 1159917159
 => -1377804984
 => -738843914
 => -1578756103
 => -464090986
 => 1711504679
 => 545330655
 => 379462570
 => 514511099
 => -1813251176
 => 1424958266
 => -825255131
 => 539054595
 => -1764192010
 => -1243277769
 => 2017874281
 => -1972353607
 => 1879761467
 => 1638986560
 => -1832287507
 => -492411882
 => 658940812
 => -1044199400
 => 1586504918
 => -125492611
 => -1562883174
 => -1013778441
 => 1560228607
 => -550265689
 => 524767105
 => -713387661
 => 1425927738
 => 942653932
 => 1233220698
 => 1313602368
 => -140318584
 => 1199179892
 => 688298322
 => -1709546982
 => 1701392078
 => -1630848421
 => -886500935
 => -196324972
 => -436037402
 => -520341784
 => -1485224804
 => -311036236
 => -1503442439
 => -110945695
 => -82825175
 => 46859773
 => -1199223018
 => -1190555925
 => 326384434
 => 1486817960
 => -1411425597
 => -508426854
 => 820019294
 => 710762995
 => -760867032
 => -709611146
 => 732190215
 => 236336673
 => 740596257
 => 1135321785
 => 2067474156
 => -1395683607
 => -240528699
 => 928616892
 => 1712486685
 => 1994118287
 => 1333321243
 => 194124284
 => 615083294
 => 628086450
 => 498957825
 => 1359697121
 => 1888433963
 => 941623020
 => -1925663292
 => -771540264
 => -1058341359
 => 182127597
 => 646955927
 => -1424621714
 => 623062612
 => -1986955586
 => -1268826980
 => -456776220
 => -1112555329
 => -1532134052
 => 1960404034
 => 1573325453
 => -316619303
 => 699712177
 => 863274966
 => 1728276475
 => -246695889
 => 1919485436
 => 111273464
 => 125435213
 => 155132602
 => -171674076
 => 655046914
 => 1577399562
 => 1028818150
 => 447058239
 => -1057920269
 => -1326215323
 => -198688588
 => 1523643051
 => 231373233
 => 1121759962
 => 1449439846
 => -1615270753
 => -1509293864
 => 2116903943
 => 672822173
 => -969573911
 => 1589904755
 => 1148782015
 => 663503316
 => 933352745
 => 577717039
 => 402172048
 => 1812250453
 => 667300501
 => -1838825777
 => -856474776
 => 420696035
 => 2131427774
 => -435303548
 => -160883878
 => 1969629634
 => -555794155
 => -835119691
 => -1460907909
 => -1146924084
   KeepTop(10):
 => -200078348
 => -29799264
 => 1630721656
 => 959306175
 => 1527421791
 => 1259692483
 => -1289244298
 => -1572996668
 => -2069479746
 => -1819131606
 => 688298322
 => -1709546982
 => 1701392078
 => -1630848421
 => -886500935
 => -196324972
 => -436037402
 => -520341784
 => -1485224804
 => -311036236
   KeepBottom(8):
 => 1630721656
 => 959306175
 => 1527421791
 => 1259692483
 => -1289244298
 => -1572996668
 => -2069479746
 => -1819131606
 => 1701392078
 => -1630848421
 => -886500935
 => -196324972
 => -436037402
 => -520341784
 => -1485224804
 => -311036236
   RemoveBottom(2):
 => 1630721656
 => 959306175
 => 1527421791
 => 1259692483
 => -1289244298
 => -1572996668
 => 1701392078
 => -1630848421
 => -886500935
 => -196324972
 => -436037402
 => -520341784
   RemoveTop(2):
 => 1527421791
 => 1259692483
 => -1289244298
 => -1572996668
 => -886500935
 => -196324972
 => -436037402
 => -520341784
   RemoveList({1003, 1004}):
 => 1527421791
 => -1572996668
 => -886500935
 => -520341784
   KeepList({1003, 1004, 1005}):
-=> -1572996668
+=> -520341784
   AddList({1005, 4000, 4001, 4002}):
 => 1005
 => 8000

src/genworld.cpp

➞

Show inline comments

@@ @@ -96,6 +96,7 @@ static void _GenerateWorld() @@
 		_random.SetSeed(_settings_game.game_creation.generation_seed);
 		SetGeneratingWorldProgress(GWP_MAP_INIT, 2);
 		SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, HT_NONE, WC_MAIN_WINDOW, 0);
 		ScriptObject::InitializeRandomizers();
 		BasePersistentStorageArray::SwitchMode(PSM_ENTER_GAMELOOP);

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -251,6 +251,8 @@ static void InitializeWindowsAndCaches() @@
 	UpdateAllVirtCoords();
 	ResetViewportAfterLoadGame();
 	ScriptObject::InitializeRandomizers();
 	for (Company *c : Company::Iterate()) {
 		/* For each company, verify (while loading a scenario) that the inauguration date is the current year and set it
 		 * accordingly if it is not the case.  No need to set it on companies that are not been used already,

src/script/api/script_object.cpp

➞

Show inline comments

@@ @@ -312,9 +312,18 @@ bool ScriptObject::DoCommandProcessResul @@
 	NOT_REACHED();
+}
 Randomizer &ScriptObject::GetRandomizer()
 /* static */ Randomizer ScriptObject::random_states[OWNER_END];
 Randomizer &ScriptObject::GetRandomizer(Owner owner)
+{
 	/* We pick _random if we are in SP (so when saved, we do the same over and over)
 	 * but we pick _interactive_random if we are a network_server or network-client. */
 	return _networking ? _interactive_random : _random;
 	return ScriptObject::random_states[owner];
+}
 void ScriptObject::InitializeRandomizers()
+{
 	Randomizer random = _random;
 	for (Owner owner = OWNER_BEGIN; owner < OWNER_END; owner++) {
 		ScriptObject::GetRandomizer(owner).SetSeed(random.Next());
+	}
+}

src/script/api/script_object.hpp

➞

Show inline comments

@@ @@ -76,8 +76,15 @@ public: @@
 	/**
 	 * Get a reference of the randomizer that brings this script random values.
 	 * @param owner The owner/script to get the randomizer for. This defaults to ScriptObject::GetRootCompany()
 	 */
 	static Randomizer &GetRandomizer();
 	static Randomizer &GetRandomizer(Owner owner = ScriptObject::GetRootCompany());
 	/**
 	 * Initialize/reset the script random states. The state of the scripts are
 	 * based on the current _random seed, but _random does not get changed.
 	 */
 	static void InitializeRandomizers();
 protected:
 	template<Commands TCmd, typename T> struct ScriptDoCommandHelper;
@@ @@ -279,6 +286,7 @@ private: @@
 	static std::tuple<bool, bool, bool> DoCommandPrep();
 	static bool DoCommandProcessResult(const CommandCost &res, Script_SuspendCallbackProc *callback, bool estimate_only);
 	static CommandCallbackData *GetDoCommandCallback();
 	static Randomizer random_states[OWNER_END]; ///< Random states for each of the scripts (game script uses OWNER_DEITY)
 };
 namespace ScriptObjectInternal {

0 comments (0 inline, 0 general)