Skip to content

Change thread functions to void return type #3130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mercury233 merged 1 commit into from
Jun 30, 2026
Merged

Change thread functions to void return type #3130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions gframe/image_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ irr::video::ITexture* ImageManager::GetBigPicture(int code, float zoom) {
tBigPicture = addTexture(name, img, origsize.Width * zoom, origsize.Height * zoom);
return tBigPicture;
}
int ImageManager::LoadThumbThread() {
void ImageManager::LoadThumbThread() {
while(true) {
imageManager.tThumbLoadingMutex.lock();
imageManager.tThumbLoadingThreadRunning = !imageManager.tThumbLoadingCodes.empty();
Expand Down Expand Up @@ -330,7 +330,6 @@ int ImageManager::LoadThumbThread() {
imageManager.tThumbLoadingMutex.unlock();
}
}
return 0;
}
/**
* Load managed card thumbnail texture.
Expand Down
2 changes: 1 addition & 1 deletion gframe/image_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ImageManager {
irr::video::ITexture* GetTextureThumb(int code);
irr::video::ITexture* GetTextureField(int code);
irr::video::ITexture* GetTextureButton(int code, bool defense = false);
static int LoadThumbThread();
static void LoadThumbThread();

std::unordered_map<int, irr::video::ITexture*> tMap[2];
std::unordered_map<int, irr::video::ITexture*> tThumb;
Expand Down
5 changes: 2 additions & 3 deletions gframe/replay_mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ bool ReplayMode::ReadReplayResponse() {
set_responseb(pduel, resp);
return result;
}
int ReplayMode::ReplayThread() {
void ReplayMode::ReplayThread() {
const auto& rh = cur_replay.pheader.base;
mainGame->dInfo.Clear();
mainGame->dInfo.isFirst = true;
Expand All @@ -69,7 +69,7 @@ int ReplayMode::ReplayThread() {
set_message_handler(ReplayMode::MessageHandler);
if(!StartDuel()) {
EndDuel();
return 0;
return;
}
mainGame->dInfo.isStarted = true;
mainGame->dInfo.isFinished = false;
Expand Down Expand Up @@ -152,7 +152,6 @@ int ReplayMode::ReplayThread() {
skip_turn = 0;
current_step = 0;
skip_step = 0;
return 0;
}
bool ReplayMode::StartDuel() {
const auto& rh = cur_replay.pheader.base;
Expand Down
2 changes: 1 addition & 1 deletion gframe/replay_mode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ReplayMode {
static void SwapField();
static void Pause(bool is_pause, bool is_step);
static bool ReadReplayResponse();
static int ReplayThread();
static void ReplayThread();
static bool StartDuel();
static void EndDuel();
static void Restart(bool refresh);
Expand Down
5 changes: 2 additions & 3 deletions gframe/single_mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void SingleMode::SetResponse(unsigned char* resp, unsigned int len) {
last_replay_response_size = last_replay.WriteResponse(resp, len);
set_responseb(pduel, resp);
}
int SingleMode::SinglePlayThread() {
void SingleMode::SinglePlayThread() {
const int start_lp = 8000;
const int start_hand = 5;
const int draw_count = 1;
Expand Down Expand Up @@ -87,7 +87,7 @@ int SingleMode::SinglePlayThread() {
}
if(slen == 0) {
end_duel(pduel);
return 0;
return;
}
mainGame->gMutex.lock();
mainGame->HideElement(mainGame->wSinglePlay);
Expand Down Expand Up @@ -180,7 +180,6 @@ int SingleMode::SinglePlayThread() {
if(mainGame->exit_on_return)
mainGame->device->closeDevice();
}
return 0;
}
bool SingleMode::SinglePlayAnalyze(unsigned char* msg, unsigned int len) {
unsigned char* offset, * pbuf = msg;
Expand Down
2 changes: 1 addition & 1 deletion gframe/single_mode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class SingleMode {
static bool StartPlay();
static void StopPlay(bool is_exiting = false);
static void SetResponse(unsigned char* resp, unsigned int len);
static int SinglePlayThread();
static void SinglePlayThread();
static bool SinglePlayAnalyze(unsigned char* msg, unsigned int len);

static void SinglePlayRefresh(int flag = 0xf81fff);
Expand Down
Loading