fix

gframe/drawing.cpp

@@ -1262,11 +1262,7 @@ void Game::DrawDeckBd() {
 		driver->draw2DRectangle(Resize(805, 160, 1020, 630), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
 		driver->draw2DRectangleOutline(Resize(804, 159, 1020, 630));
 	}
-<<<<<<< HEAD
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #ifdef YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 	constexpr int MAX_RESULT = 9;
 #else
 	constexpr int MAX_RESULT = 7;

gframe/image_manager.cpp

 #include "image_manager.h"
 #include "game.h"
-<<<<<<< HEAD
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #ifdef YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 #include <thread>
 #endif
 #ifdef _OPENMP
@@ -26,11 +22,7 @@ bool ImageManager::Initial() {
 	tUnknownFit = nullptr;
 	tUnknownThumb = nullptr;
 	tBigPicture = nullptr;
-<<<<<<< HEAD
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #ifdef YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 	tLoading = nullptr;
 	tThumbLoadingThreadRunning = false;
 #endif
@@ -74,11 +66,7 @@ void ImageManager::ClearTexture() {
 			driver->removeTexture(tit->second);
 	}
 	for(auto tit = tThumb.begin(); tit != tThumb.end(); ++tit) {
-<<<<<<< HEAD
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #ifdef YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 		if(tit->second && tit->second != tLoading)
 #else
 		if(tit->second)
@@ -92,11 +80,7 @@ void ImageManager::ClearTexture() {
 	tMap[0].clear();
 	tMap[1].clear();
 	tThumb.clear();
-<<<<<<< HEAD
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #ifdef YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 	tThumbLoadingMutex.lock();
 	tThumbLoading.clear();
 	while(!tThumbLoadingCodes.empty())
@@ -139,11 +123,7 @@ void ImageManager::ResizeTexture() {
 	driver->removeTexture(tUnknown);
 	driver->removeTexture(tUnknownFit);
 	driver->removeTexture(tUnknownThumb);
-<<<<<<< HEAD
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #ifdef YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 	driver->removeTexture(tLoading);
 	tLoading = GetTextureFromFile("textures/cover.jpg", imgWidthThumb, imgHeightThumb);
 #endif
@@ -318,11 +298,7 @@ irr::video::ITexture* ImageManager::GetBigPicture(int code, float zoom) {
 	tBigPicture = texture;
 	return texture;
 }
-<<<<<<< HEAD
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #ifdef YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 int ImageManager::LoadThumbThread() {
 	while(true) {
 		imageManager.tThumbLoadingMutex.lock();
@@ -378,19 +354,11 @@ int ImageManager::LoadThumbThread() {
 	imageManager.tThumbLoadingMutex.unlock();
 	return 0;
 }
-<<<<<<< HEAD
-#endif // YGOPRO_USE_THUMB_LOAD_THERAD
-irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
-	if(code == 0)
-		return tUnknownThumb;
-#ifndef YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #endif // YGOPRO_USE_THUMB_LOAD_THREAD
 irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 	if(code == 0)
 		return tUnknownThumb;
 #ifndef YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 	auto tit = tThumb.find(code);
 	if(tit == tThumb.end()) {
 		char file[256];
@@ -413,11 +381,7 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 		tThumb[code] = img;
 		return (img == NULL) ? tUnknownThumb : img;
 	}
-<<<<<<< HEAD
-#else // YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #else // YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 	imageManager.tThumbLoadingMutex.lock();
 	auto lit = tThumbLoading.find(code);
 	if(lit != tThumbLoading.end()) {
@@ -445,11 +409,7 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 		imageManager.tThumbLoadingMutex.unlock();
 		return tLoading;
 	}
-<<<<<<< HEAD
-#endif // YGOPRO_USE_THUMB_LOAD_THERAD
-=======
 #endif // YGOPRO_USE_THUMB_LOAD_THREAD
->>>>>>> 47859b49df470c09130a8ed4cb9922ab8036c538
 	if(tit->second)
 		return tit->second;
 	else