update to latest xygine version

fallahn · fallahn · commit 8a2f7745bd76 · 2021-02-11T13:16:53.000Z
diff --git a/bubble_pop/src/GameDirector.cpp b/bubble_pop/src/GameDirector.cpp
@@ -441,7 +441,7 @@ void GameDirector::queueBubble()
     }
     else if (activeColours.size() > 1)
     {
-        id = activeColours[xy::Util::Random::value(0, activeColours.size() - 1)];
+        id = activeColours[xy::Util::Random::value(0u, activeColours.size() - 1)];
     }
 
     //place bubble at spawn point
diff --git a/bubble_pop/src/GameOverState.cpp b/bubble_pop/src/GameOverState.cpp
@@ -95,7 +95,7 @@ bool GameOverState::handleEvent(const sf::Event& evt)
 
                 if (m_playerName.empty())
                 {
-                    m_playerName = names[xy::Util::Random::value(0, names.size() - 1)];
+                    m_playerName = names[xy::Util::Random::value(0u, names.size() - 1)];
                 }
 
                 if (m_sharedData.score > m_sharedData.highScores.back().second)
@@ -232,4 +232,4 @@ void GameOverState::updatePlayerString()
         e.getComponent<xy::Transform>().setOrigin(bounds.width / 2.f, bounds.height / 2.f);
     };
     m_scene.getSystem<xy::CommandSystem>().sendCommand(cmd);
-}
+}
diff --git a/did/src/FlappySailSystem.cpp b/did/src/FlappySailSystem.cpp
@@ -82,7 +82,7 @@ void FlappySailSystem::process(float dt)
 void FlappySailSystem::onEntityAdded(xy::Entity entity)
 {
     auto& sail = entity.getComponent<FlappySail>();
-    sail.indexA = xy::Util::Random::value(0, m_waveTable.size() - 1);
+    sail.indexA = xy::Util::Random::value(0u, m_waveTable.size() - 1);
     sail.indexB = (sail.indexA + xy::Util::Random::value(12, 32)) % m_waveTable.size();
 
     entity.getComponent<xy::Drawable>().getVertices().resize(8);
@@ -92,4 +92,4 @@ void FlappySailSystem::onEntityAdded(xy::Entity entity)
 void FlappySailSystem::setWindStrength(float strength)
 {
     m_targetWindStrength = std::min(strength, MaxWind);
-}
+}
diff --git a/did/src/FoliageGenerator.cpp b/did/src/FoliageGenerator.cpp
@@ -108,7 +108,7 @@ void FoliageGenerator::generate(const MapData& data, xy::Scene& scene)
             {
                 while (!passComplete)
                 {
-                    std::size_t spriteIndex = xy::Util::Random::value(0, sprites.size() - 1);
+                    std::size_t spriteIndex = xy::Util::Random::value(0u, sprites.size() - 1);
                     auto sprite = sprites[spriteIndex];
 
                     sf::FloatRect spriteRect = sprite.getLocalBounds();
@@ -170,7 +170,7 @@ void FoliageGenerator::generate(const MapData& data, xy::Scene& scene)
                 auto count = (f.width > (Global::TileSize * 2.5f)) ? xy::Util::Random::value(1, 2) : 1;
                 for (auto j = 0; j < count; ++j)
                 {
-                    auto& sprite = m_midSprites[xy::Util::Random::value(0, m_midSprites.size() - 1)];
+                    auto& sprite = m_midSprites[xy::Util::Random::value(0u, m_midSprites.size() - 1)];
                     sf::FloatRect spriteRect = sprite.getLocalBounds();
                     sf::Vector2f position(xPos, static_cast<float>(FoliageHeight));
                     sprite.setPosition(position);
@@ -246,4 +246,4 @@ void FoliageGenerator::generate(const MapData& data, xy::Scene& scene)
             m_textures.resize(m_textures.size() + 10);
         }
     }
-}
+}
diff --git a/did/src/LoadingScreen.cpp b/did/src/LoadingScreen.cpp
@@ -105,7 +105,7 @@ void LoadingScreen::draw(sf::RenderTarget& rt, sf::RenderStates) const
 
 void LoadingScreen::updateMessage()
 {
-    m_text.setString(randomMessages[xy::Util::Random::value(0, randomMessages.size() - 1)]);
+    m_text.setString(randomMessages[xy::Util::Random::value(0u, randomMessages.size() - 1)]);
     m_text.setOrigin(m_text.getLocalBounds().width / 2.f, m_text.getLocalBounds().height / 2.f);
     m_text.setPosition(xy::DefaultSceneSize.x / 2.f, 980.f);
-}
+}
diff --git a/did/src/MenuHatFunctions.cpp b/did/src/MenuHatFunctions.cpp
@@ -456,7 +456,7 @@ void MenuState::buildNameEntry(sf::Font& largeFont)
 
                     if (m_sharedData.clientName.isEmpty())
                     {
-                        m_sharedData.clientName = names[xy::Util::Random::value(0, names.size() - 1)];
+                        m_sharedData.clientName = names[xy::Util::Random::value(0u, names.size() - 1)];
                     }
                 }
             });
@@ -632,7 +632,7 @@ void MenuState::buildJoinEntry(sf::Font& largeFont)
 
                     if (m_sharedData.clientName.isEmpty())
                     {
-                        m_sharedData.clientName = names[xy::Util::Random::value(0, names.size() - 1)];
+                        m_sharedData.clientName = names[xy::Util::Random::value(0u, names.size() - 1)];
                     }
 
                     if (m_sharedData.remoteIP.isEmpty())
diff --git a/did/src/MenuLobbyFunctions.cpp b/did/src/MenuLobbyFunctions.cpp
@@ -197,7 +197,7 @@ void MenuState::randomiseSeed()
     for (auto i = 0; i < passes; ++i)
     {
         //add a random char
-        string[xy::Util::Random::value(0, string.size() - 1)] = static_cast<char>(xy::Util::Random::value(32, 126));
+        string[xy::Util::Random::value(0u, string.size() - 1)] = static_cast<char>(xy::Util::Random::value(32, 126));
     }
     std::shuffle(string.begin(), string.end(), xy::Util::Random::rndEngine);
     *m_activeString = string;
@@ -304,4 +304,4 @@ void MenuState::updateChatOutput(xy::Entity e, float)
     e.getComponent<xy::Transform>().setOrigin(0.f, bounds.height);
     e.getComponent<xy::Drawable>().setCroppingArea(crop);
     e.getComponent<xy::AudioEmitter>().play();
-}
+}
diff --git a/did/src/MenuState.cpp b/did/src/MenuState.cpp
@@ -1049,7 +1049,7 @@ void MenuState::loadSettings()
     //if settings not found set some default values
     if (!xy::FileSystem::fileExists(settingsPath + NameFile))
     {
-        m_sharedData.clientName = names[xy::Util::Random::value(0, names.size() - 1)];
+        m_sharedData.clientName = names[xy::Util::Random::value(0u, names.size() - 1)];
     }
     else
     {
diff --git a/did/src/Server.cpp b/did/src/Server.cpp
@@ -54,7 +54,7 @@ GameServer::GameServer()
 {
     m_sharedStateData.gameServer = this;
 
-    const char* defaultSeed = RandomSeeds[xy::Util::Random::value(0, RandomSeeds.size() - 1)];
+    const char* defaultSeed = RandomSeeds[xy::Util::Random::value(0u, RandomSeeds.size() - 1)];
     std::strcpy(m_sharedStateData.seedData.str, defaultSeed);
 
     std::hash<std::string> hash;
@@ -301,4 +301,4 @@ void GameServer::run()
     }
 
     m_host.stop();
-}
+}
diff --git a/platformer/include/BobAnimationSystem.hpp b/platformer/include/BobAnimationSystem.hpp
@@ -67,6 +67,6 @@ class BobAnimationSystem final : public xy::System
 
     void onEntityAdded(xy::Entity entity) override
     {
-        entity.getComponent<BobAnimation>().index = xy::Util::Random::value(0, m_waveTable.size() - 1);
+        entity.getComponent<BobAnimation>().index = xy::Util::Random::value(0u, m_waveTable.size() - 1);
     }
-};
+};
diff --git a/platformer/src/GameState.cpp b/platformer/src/GameState.cpp
@@ -838,7 +838,7 @@ void GameState::loadCollision()
                 cEnt.addComponent<xy::Drawable>();
                 cEnt.addComponent<xy::Sprite>() = m_sprites[spriteID];
                 cEnt.addComponent<xy::SpriteAnimation>().play(0);
-                cEnt.getComponent<xy::SpriteAnimation>().setFrameID(xy::Util::Random::value(0, m_sprites[spriteID].getAnimations()[0].frames.size()));
+                cEnt.getComponent<xy::SpriteAnimation>().setFrameID(xy::Util::Random::value(0u, m_sprites[spriteID].getAnimations()[0].frames.size()));
                 cEnt.addComponent<BobAnimation>().parent = entity;
 
                 entity.getComponent<xy::Transform>().addChild(cEnt.getComponent<xy::Transform>());
diff --git a/platformer/src/ShakerSystem.cpp b/platformer/src/ShakerSystem.cpp
@@ -84,5 +84,5 @@ void ShakerSystem::onEntityAdded(xy::Entity entity)
 {
     auto& shaker = entity.getComponent<Shaker>();
     shaker.basePosition = entity.getComponent<xy::Transform>().getPosition();
-    shaker.index = xy::Util::Random::value(0, wavetable.size() - 1);
-}
+    shaker.index = xy::Util::Random::value(0u, wavetable.size() - 1);
+}
diff --git a/space_racers/src/LoadingScreen.cpp b/space_racers/src/LoadingScreen.cpp
@@ -113,7 +113,7 @@ void LoadingScreen::draw(sf::RenderTarget& rt, sf::RenderStates) const
 
 void LoadingScreen::updateMessage()
 {
-    m_text.setString(randomMessages[xy::Util::Random::value(0, randomMessages.size() - 1)]);
+    m_text.setString(randomMessages[xy::Util::Random::value(0u, randomMessages.size() - 1)]);
     m_text.setOrigin(m_text.getLocalBounds().width / 2.f, m_text.getLocalBounds().height / 2.f);
     m_text.setPosition(xy::DefaultSceneSize.x / 2.f, 980.f);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ void GameDirector::queueBubble()`
`441`	`441`	`}`
`442`	`442`	`else if (activeColours.size() > 1)`
`443`	`443`	`{`
`444`		`- id = activeColours[xy::Util::Random::value(0, activeColours.size() - 1)];`
	`444`	`+ id = activeColours[xy::Util::Random::value(0u, activeColours.size() - 1)];`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`//place bubble at spawn point`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ bool GameOverState::handleEvent(const sf::Event& evt)`
`95`	`95`
`96`	`96`	`if (m_playerName.empty())`
`97`	`97`	`{`
`98`		`- m_playerName = names[xy::Util::Random::value(0, names.size() - 1)];`
	`98`	`+ m_playerName = names[xy::Util::Random::value(0u, names.size() - 1)];`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`if (m_sharedData.score > m_sharedData.highScores.back().second)`
`@@ -232,4 +232,4 @@ void GameOverState::updatePlayerString()`
`232`	`232`	`e.getComponent<xy::Transform>().setOrigin(bounds.width / 2.f, bounds.height / 2.f);`
`233`	`233`	`};`
`234`	`234`	`m_scene.getSystem<xy::CommandSystem>().sendCommand(cmd);`
`235`		`-}`
	`235`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void FlappySailSystem::process(float dt)`
`82`	`82`	`void FlappySailSystem::onEntityAdded(xy::Entity entity)`
`83`	`83`	`{`
`84`	`84`	`auto& sail = entity.getComponent<FlappySail>();`
`85`		`- sail.indexA = xy::Util::Random::value(0, m_waveTable.size() - 1);`
	`85`	`+ sail.indexA = xy::Util::Random::value(0u, m_waveTable.size() - 1);`
`86`	`86`	`sail.indexB = (sail.indexA + xy::Util::Random::value(12, 32)) % m_waveTable.size();`
`87`	`87`
`88`	`88`	`entity.getComponent<xy::Drawable>().getVertices().resize(8);`
`@@ -92,4 +92,4 @@ void FlappySailSystem::onEntityAdded(xy::Entity entity)`
`92`	`92`	`void FlappySailSystem::setWindStrength(float strength)`
`93`	`93`	`{`
`94`	`94`	`m_targetWindStrength = std::min(strength, MaxWind);`
`95`		`-}`
	`95`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ void FoliageGenerator::generate(const MapData& data, xy::Scene& scene)`
`108`	`108`	`{`
`109`	`109`	`while (!passComplete)`
`110`	`110`	`{`
`111`		`- std::size_t spriteIndex = xy::Util::Random::value(0, sprites.size() - 1);`
	`111`	`+ std::size_t spriteIndex = xy::Util::Random::value(0u, sprites.size() - 1);`
`112`	`112`	`auto sprite = sprites[spriteIndex];`
`113`	`113`
`114`	`114`	`sf::FloatRect spriteRect = sprite.getLocalBounds();`
`@@ -170,7 +170,7 @@ void FoliageGenerator::generate(const MapData& data, xy::Scene& scene)`
`170`	`170`	`auto count = (f.width > (Global::TileSize * 2.5f)) ? xy::Util::Random::value(1, 2) : 1;`
`171`	`171`	`for (auto j = 0; j < count; ++j)`
`172`	`172`	`{`
`173`		`- auto& sprite = m_midSprites[xy::Util::Random::value(0, m_midSprites.size() - 1)];`
	`173`	`+ auto& sprite = m_midSprites[xy::Util::Random::value(0u, m_midSprites.size() - 1)];`
`174`	`174`	`sf::FloatRect spriteRect = sprite.getLocalBounds();`
`175`	`175`	`sf::Vector2f position(xPos, static_cast<float>(FoliageHeight));`
`176`	`176`	`sprite.setPosition(position);`
`@@ -246,4 +246,4 @@ void FoliageGenerator::generate(const MapData& data, xy::Scene& scene)`
`246`	`246`	`m_textures.resize(m_textures.size() + 10);`
`247`	`247`	`}`
`248`	`248`	`}`
`249`		`-}`
	`249`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void LoadingScreen::draw(sf::RenderTarget& rt, sf::RenderStates) const`
`105`	`105`
`106`	`106`	`void LoadingScreen::updateMessage()`
`107`	`107`	`{`
`108`		`- m_text.setString(randomMessages[xy::Util::Random::value(0, randomMessages.size() - 1)]);`
	`108`	`+ m_text.setString(randomMessages[xy::Util::Random::value(0u, randomMessages.size() - 1)]);`
`109`	`109`	`m_text.setOrigin(m_text.getLocalBounds().width / 2.f, m_text.getLocalBounds().height / 2.f);`
`110`	`110`	`m_text.setPosition(xy::DefaultSceneSize.x / 2.f, 980.f);`
`111`		`-}`
	`111`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ void MenuState::buildNameEntry(sf::Font& largeFont)`
`456`	`456`
`457`	`457`	`if (m_sharedData.clientName.isEmpty())`
`458`	`458`	`{`
`459`		`- m_sharedData.clientName = names[xy::Util::Random::value(0, names.size() - 1)];`
	`459`	`+ m_sharedData.clientName = names[xy::Util::Random::value(0u, names.size() - 1)];`
`460`	`460`	`}`
`461`	`461`	`}`
`462`	`462`	`});`
`@@ -632,7 +632,7 @@ void MenuState::buildJoinEntry(sf::Font& largeFont)`
`632`	`632`
`633`	`633`	`if (m_sharedData.clientName.isEmpty())`
`634`	`634`	`{`
`635`		`- m_sharedData.clientName = names[xy::Util::Random::value(0, names.size() - 1)];`
	`635`	`+ m_sharedData.clientName = names[xy::Util::Random::value(0u, names.size() - 1)];`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`if (m_sharedData.remoteIP.isEmpty())`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ void MenuState::randomiseSeed()`
`197`	`197`	`for (auto i = 0; i < passes; ++i)`
`198`	`198`	`{`
`199`	`199`	`//add a random char`
`200`		`- string[xy::Util::Random::value(0, string.size() - 1)] = static_cast<char>(xy::Util::Random::value(32, 126));`
	`200`	`+ string[xy::Util::Random::value(0u, string.size() - 1)] = static_cast<char>(xy::Util::Random::value(32, 126));`
`201`	`201`	`}`
`202`	`202`	`std::shuffle(string.begin(), string.end(), xy::Util::Random::rndEngine);`
`203`	`203`	`*m_activeString = string;`
`@@ -304,4 +304,4 @@ void MenuState::updateChatOutput(xy::Entity e, float)`
`304`	`304`	`e.getComponent<xy::Transform>().setOrigin(0.f, bounds.height);`
`305`	`305`	`e.getComponent<xy::Drawable>().setCroppingArea(crop);`
`306`	`306`	`e.getComponent<xy::AudioEmitter>().play();`
`307`		`-}`
	`307`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1049,7 +1049,7 @@ void MenuState::loadSettings()`
`1049`	`1049`	`//if settings not found set some default values`
`1050`	`1050`	`if (!xy::FileSystem::fileExists(settingsPath + NameFile))`
`1051`	`1051`	`{`
`1052`		`- m_sharedData.clientName = names[xy::Util::Random::value(0, names.size() - 1)];`
	`1052`	`+ m_sharedData.clientName = names[xy::Util::Random::value(0u, names.size() - 1)];`
`1053`	`1053`	`}`
`1054`	`1054`	`else`
`1055`	`1055`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ GameServer::GameServer()`
`54`	`54`	`{`
`55`	`55`	`m_sharedStateData.gameServer = this;`
`56`	`56`
`57`		`- const char* defaultSeed = RandomSeeds[xy::Util::Random::value(0, RandomSeeds.size() - 1)];`
	`57`	`+ const char* defaultSeed = RandomSeeds[xy::Util::Random::value(0u, RandomSeeds.size() - 1)];`
`58`	`58`	`std::strcpy(m_sharedStateData.seedData.str, defaultSeed);`
`59`	`59`
`60`	`60`	`std::hash<std::string> hash;`
`@@ -301,4 +301,4 @@ void GameServer::run()`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`m_host.stop();`
`304`		`-}`
	`304`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,6 @@ class BobAnimationSystem final : public xy::System`
`67`	`67`
`68`	`68`	`void onEntityAdded(xy::Entity entity) override`
`69`	`69`	`{`
`70`		`- entity.getComponent<BobAnimation>().index = xy::Util::Random::value(0, m_waveTable.size() - 1);`
	`70`	`+ entity.getComponent<BobAnimation>().index = xy::Util::Random::value(0u, m_waveTable.size() - 1);`
`71`	`71`	`}`
`72`		`-};`
	`72`	`+};`