Skip to content

Y
ygopro
Commit 5da364cb authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'develop'

parents f52e8b19 920c69a1
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
gframe/game.cpp
View file @ 5da364cb
...@@ -90,8 +90,10 @@ bool Game::Initialize() { ...@@ -90,8 +90,10 @@ bool Game::Initialize() {
size_t count = skins.size(); size_t count = skins.size();
if(count > 0) { if(count > 0) {
int index = -1; int index = -1;
if(gameConf.skin_index < 0) if(gameConf.skin_index < 0) {
index = rand() % count; std::random_device rd;
index = rd() % count;
}
else if((size_t)gameConf.skin_index <= skins.size()) else if((size_t)gameConf.skin_index <= skins.size())
index = skins.size() - gameConf.skin_index; // reverse index index = skins.size() - gameConf.skin_index; // reverse index
if(index >= 0) if(index >= 0)
......
gframe/image_manager.cpp
View file @ 5da364cb
...@@ -71,8 +71,9 @@ irr::video::ITexture* ImageManager::GetRandomImage(int image_type) { ...@@ -71,8 +71,9 @@ irr::video::ITexture* ImageManager::GetRandomImage(int image_type) {
return NULL; return NULL;
char ImageName[1024]; char ImageName[1024];
wchar_t fname[1024]; wchar_t fname[1024];
std::random_device rd;
if(saved_image_id[image_type] == -1) if(saved_image_id[image_type] == -1)
saved_image_id[image_type] = rand() % count; saved_image_id[image_type] = rd() % count;
int image_id = saved_image_id[image_type]; int image_id = saved_image_id[image_type];
auto name = ImageList[image_type][image_id].c_str(); auto name = ImageList[image_type][image_id].c_str();
myswprintf(fname, L"./textures/%ls", name); myswprintf(fname, L"./textures/%ls", name);
...@@ -85,8 +86,9 @@ irr::video::ITexture* ImageManager::GetRandomImage(int image_type, s32 width, s3 ...@@ -85,8 +86,9 @@ irr::video::ITexture* ImageManager::GetRandomImage(int image_type, s32 width, s3
return NULL; return NULL;
char ImageName[1024]; char ImageName[1024];
wchar_t fname[1024]; wchar_t fname[1024];
std::random_device rd;
if(saved_image_id[image_type] == -1) if(saved_image_id[image_type] == -1)
saved_image_id[image_type] = rand() % count; saved_image_id[image_type] = rd() % count;
int image_id = saved_image_id[image_type]; int image_id = saved_image_id[image_type];
auto name = ImageList[image_type][image_id].c_str(); auto name = ImageList[image_type][image_id].c_str();
myswprintf(fname, L"./textures/%ls", name); myswprintf(fname, L"./textures/%ls", name);
......
script @ fd87b374
Subproject commit ca695a4fc929a1a45d795236e71fd6fd49a34bf2 Subproject commit fd87b37488f865f8e321b576b6166f51cb82a63b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment