Commit 22cedb89 authored by edo9300's avatar edo9300

Fix

parent 914f7b78
...@@ -75,11 +75,11 @@ void Game::DrawBackGround() { ...@@ -75,11 +75,11 @@ void Game::DrawBackGround() {
break; break;
} }
case 3: { case 3: {
tfield = 1; tfield = 0;
break; break;
} }
case 4: { case 4: {
tfield = 0; tfield = 1;
break; break;
} }
} }
......
...@@ -1506,19 +1506,19 @@ int Game::GetMasterRule(uint32 param, uint32 forbiddentypes, int* truerule) { ...@@ -1506,19 +1506,19 @@ int Game::GetMasterRule(uint32 param, uint32 forbiddentypes, int* truerule) {
if (truerule) if (truerule)
*truerule = 2; *truerule = 2;
if (forbiddentypes == MASTER_RULE_2_FORB) if (forbiddentypes == MASTER_RULE_2_FORB)
return 1; return 2;
} }
case MASTER_RULE_3: { case MASTER_RULE_3: {
if (truerule) if (truerule)
*truerule = 3; *truerule = 3;
if (forbiddentypes == MASTER_RULE_3_FORB) if (forbiddentypes == MASTER_RULE_3_FORB)
return 1; return 3;
} }
case MASTER_RULE_4: { case MASTER_RULE_4: {
if (truerule) if (truerule)
*truerule = 4; *truerule = 4;
if (forbiddentypes == MASTER_RULE_4_FORB) if (forbiddentypes == MASTER_RULE_4_FORB)
return 1; return 4;
} }
default: { default: {
if (truerule) if (truerule)
......
...@@ -548,21 +548,25 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -548,21 +548,25 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
case 0:{ case 0:{
mainGame->cbDuelRule->removeItem(4); mainGame->cbDuelRule->removeItem(4);
mainGame->duel_param = MASTER_RULE_1; mainGame->duel_param = MASTER_RULE_1;
mainGame->forbiddentypes = MASTER_RULE_1_FORB;
break; break;
} }
case 1: { case 1: {
mainGame->cbDuelRule->removeItem(4); mainGame->cbDuelRule->removeItem(4);
mainGame->duel_param = MASTER_RULE_2; mainGame->duel_param = MASTER_RULE_2;
mainGame->forbiddentypes = MASTER_RULE_2_FORB;
break; break;
} }
case 2: { case 2: {
mainGame->cbDuelRule->removeItem(4); mainGame->cbDuelRule->removeItem(4);
mainGame->duel_param = MASTER_RULE_3; mainGame->duel_param = MASTER_RULE_3;
mainGame->forbiddentypes = MASTER_RULE_3_FORB;
break; break;
} }
case 3: { case 3: {
mainGame->cbDuelRule->removeItem(4); mainGame->cbDuelRule->removeItem(4);
mainGame->duel_param = MASTER_RULE_4; mainGame->duel_param = MASTER_RULE_4;
mainGame->forbiddentypes = MASTER_RULE_4_FORB;
break; break;
} }
} }
......
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