Merge pull request #2 from Fluorohydride/master

merge

gframe/duelclient.cpp

@@ -159,7 +159,9 @@ void DuelClient::ClientEvent(bufferevent *bev, short events, void *ctx) {
 					mainGame->btnCreateHost->setEnabled(true);
 					mainGame->btnJoinHost->setEnabled(true);
 					mainGame->btnJoinCancel->setEnabled(true);
-					mainGame->CloseDuelWindow();
+					mainGame->closeDoneSignal.Reset();
+					mainGame->closeSignal.Set();
+					mainGame->closeDoneSignal.Wait();
 					mainGame->dInfo.isStarted = false;
 					mainGame->is_building = false;
 					mainGame->device->setEventReceiver(&mainGame->menuHandler);
@@ -498,7 +500,9 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->actionSignal.Reset();
 		mainGame->actionSignal.Wait();
 		mainGame->gMutex.Lock();
-		mainGame->CloseDuelWindow();
+		mainGame->closeDoneSignal.Reset();
+		mainGame->closeSignal.Set();
+		mainGame->closeDoneSignal.Wait();
 		mainGame->dInfo.isStarted = false;
 		mainGame->btnCreateHost->setEnabled(true);
 		mainGame->btnJoinHost->setEnabled(true);
@@ -708,7 +712,9 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		mainGame->actionSignal.Reset();
 		mainGame->actionSignal.Wait();
 		mainGame->gMutex.Lock();
-		mainGame->CloseDuelWindow();
+		mainGame->closeDoneSignal.Reset();
+		mainGame->closeSignal.Set();
+		mainGame->closeDoneSignal.Wait();
 		mainGame->dInfo.isStarted = false;
 		mainGame->btnCreateHost->setEnabled(true);
 		mainGame->btnJoinHost->setEnabled(true);

gframe/event_handler.cpp

@@ -100,7 +100,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				}
 				if(mainGame->dInfo.player_type == 7) {
 					DuelClient::StopClient();
-					mainGame->CloseDuelWindow();
 					mainGame->dInfo.isStarted = false;
 					mainGame->device->setEventReceiver(&mainGame->menuHandler);
 					mainGame->btnCreateHost->setEnabled(true);

gframe/game.cpp

@@ -543,6 +543,8 @@ void Game::MainLoop() {
 			}
 		}
 		driver->endScene();
+		if(closeSignal.Wait(0))
+			CloseDuelWindow();
 		fps++;
 		cur_time = timer->getTime();
 		if(cur_time < fps * 17 - 20)
@@ -907,6 +909,7 @@ void Game::CloseDuelWindow() {
 	lstHostList->clear();
 	DuelClient::hosts.clear();
 	ClearTextures();
+	closeDoneSignal.Set();
 }
 int Game::LocalPlayer(int player) {
 	return dInfo.isFirst ? player : 1 - player;

gframe/game.h

@@ -102,6 +102,8 @@ public:
 	Signal actionSignal;
 	Signal replaySignal;
 	Signal singleSignal;
+	Signal closeSignal;
+	Signal closeDoneSignal;
 	Config gameConf;
 	DuelInfo dInfo;
 

gframe/mysignal.h

@@ -25,6 +25,11 @@ public:
 			return;
 		WaitForSingleObject(_event, INFINITE);
 	}
+	bool Wait(long milli) {
+		if(_nowait)
+			return false;
+		return WaitForSingleObject(_event, milli + 1) != WAIT_TIMEOUT;
+	}
 	void SetNoWait(bool nowait) {
 		_nowait = nowait;
 	}
@@ -83,6 +88,38 @@ public:
 		_state = false;
 		pthread_mutex_unlock(&_mutex);
 	}
+
+	bool Wait(long milliseconds)
+	{
+		if (_nowait || pthread_mutex_lock(&_mutex) != 0)
+			return false;
+
+		int rc = 0;
+		struct timespec abstime;
+
+		struct timeval tv;
+		gettimeofday(&tv, NULL);
+		abstime.tv_sec  = tv.tv_sec + milliseconds / 1000;
+		abstime.tv_nsec = tv.tv_usec*1000 + (milliseconds % 1000)*1000000;
+		if (abstime.tv_nsec >= 1000000000)
+		{
+			abstime.tv_nsec -= 1000000000;
+			abstime.tv_sec++;
+		}
+
+		while (!_state) 
+		{
+			if ((rc = pthread_cond_timedwait(&_cond, &_mutex, &abstime)))
+			{
+				if (rc == ETIMEDOUT) break;
+				pthread_mutex_unlock(&_mutex);
+				return false;
+			}
+		}
+		_state = false;
+		pthread_mutex_unlock(&_mutex);
+		return rc == 0;
+	}
 	void SetNoWait(bool nowait) {
 		_nowait = nowait;
 	}

gframe/replay_mode.cpp

@@ -166,11 +166,13 @@ int ReplayMode::ReplayThread(void* param) {
 		mainGame->gMutex.Lock();
 		mainGame->dInfo.isStarted = false;
 		mainGame->dInfo.isReplay = false;
-		mainGame->CloseDuelWindow();
-		mainGame->ClearTextures();
+		mainGame->closeDoneSignal.Reset();
+		mainGame->closeSignal.Set();
+		mainGame->closeDoneSignal.Wait();
 		mainGame->ShowElement(mainGame->wReplay);
 		mainGame->gMutex.Unlock();
 		mainGame->device->setEventReceiver(&mainGame->menuHandler);
+		mainGame->closeSignal.Set();
 	}
 	return 0;
 }

gframe/single_mode.cpp

@@ -92,11 +92,12 @@ int SingleMode::SinglePlayThread(void* param) {
 		mainGame->gMutex.Lock();
 		mainGame->dInfo.isStarted = false;
 		mainGame->dInfo.isSingleMode = false;
-		mainGame->CloseDuelWindow();
-		mainGame->ClearTextures();
+		mainGame->closeDoneSignal.Reset();
+		mainGame->closeSignal.Set();
+		mainGame->closeDoneSignal.Wait();
 		mainGame->ShowElement(mainGame->wSinglePlay);
-		mainGame->gMutex.Unlock();
 		mainGame->device->setEventReceiver(&mainGame->menuHandler);
+		mainGame->gMutex.Unlock();
 	}
 	return 0;
 }

script/c24082387.lua

@@ -5,6 +5,7 @@ function c24082387.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DAMAGE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetLabel(0)
 	e1:SetCost(c24082387.cost)
 	e1:SetTarget(c24082387.target)

script/c8323633.lua

@@ -4,7 +4,7 @@ function c8323633.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetTarget(c8323633.target)
+	e1:SetOperation(c8323633.target)
 	c:RegisterEffect(e1)
 end
 function c8323633.target(e,tp,eg,ep,ev,re,r,rp,chk)

script/c83438826.lua

@@ -76,23 +76,18 @@ end
 function c83438826.desop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if not c:IsRelateToEffect(e) or not tc:IsRelateToEffect(e) or tc:IsFaceup() then return end
-	if c:GetFlagEffect(83438826)==0 then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_EQUIP)
-		e1:SetCode(EFFECT_UPDATE_ATTACK)
-		e1:SetValue(-500)
-		e1:SetReset(RESET_EVENT+0x1fe0000)
-		c:RegisterEffect(e1)
-		c:RegisterFlagEffect(83438826,RESET_EVENT+0x1fe0000,0,0)
-		e:SetLabelObject(e1)
-		e:SetLabel(2)
-	else
-		local pe=e:GetLabelObject()
-		local ct=e:GetLabel()
-		e:SetLabel(ct+1)
-		pe:SetValue(ct*-500)
-	end
+	local eq=c:GetEquipTarget()
+	if not c:IsRelateToEffect(e) or not tc:IsRelateToEffect(e) or tc:IsFaceup() or  
+	not eq:IsAttackAbove(500)
+	then return end
+	
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_UPDATE_ATTACK)
+	e1:SetValue(-500)
+	e1:SetReset(RESET_EVENT+0x1fe0000)
+	eq:RegisterEffect(e1)
+	
 	Duel.Destroy(tc,REASON_EFFECT)
 end
 function c83438826.eqcon(e,tp,eg,ep,ev,re,r,rp)

script/c83746708.lua

@@ -41,6 +41,12 @@ function c83746708.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Equip(tp,e:GetHandler(),tc)
 	end
 end
+
+function c83746708.filter(c)
+	return c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP)
+end
+
 function c83746708.value(e,c)
-	return Duel.GetFieldGroupCount(e:GetHandler():GetControler(),LOCATION_SZONE,0)*500
+	local g=Duel.GetMatchingGroup(c83746708.filter,tp,LOCATION_ONFIELD,0,nil)
+	return g:GetCount()*500
 end