Mr2 and 1 field update with pzone removal

gframe/client_field.cpp

@@ -695,7 +695,7 @@ void ClientField::GetChainLocation(int controler, int location, int sequence, ir
 	t->X = 0;
 	t->Y = 0;
 	t->Z = 0;
-	int rule = (mainGame->dInfo.duel_rule >= 4) ? 1 : 0;
+	int rule = (mainGame->dInfo.duel_rule == 3) ? 0 : 1;
 	int speed = (mainGame->dInfo.speed) ? 1 : 0;
 	switch((location & 0x7f)) {
 	case LOCATION_DECK: {
@@ -752,7 +752,7 @@ void ClientField::GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, ir
 	int controler = pcard->controler;
 	int sequence = pcard->sequence;
 	int location = pcard->location;
-	int rule = (mainGame->dInfo.duel_rule >= 4) ? 1 : 0;
+	int rule = (mainGame->dInfo.duel_rule == 3) ? 0 : 1;
 	int speed = (mainGame->dInfo.speed) ? 1 : 0;
 	switch (location) {
 	case LOCATION_DECK: {

gframe/drawing.cpp

@@ -66,7 +66,7 @@ void Game::DrawBackGround() {
 	//draw field spell card
 	driver->setTransform(irr::video::ETS_WORLD, irr::core::IdentityMatrix);
 	bool drawField = false;
-	int rule = (dInfo.duel_rule >= 4) ? 1 : 0;
+	int rule = (dInfo.duel_rule == 3) ? 0 : 1;
 	int speed = (dInfo.speed) ? 1 : 0;
 	if(mainGame->gameConf.draw_field_spell) {
 		int fieldcode1 = -1;
@@ -101,7 +101,7 @@ void Game::DrawBackGround() {
 			}
 		}
 	}
-	matManager.mTexture.setTexture(0, drawField ? imageManager.tFieldTransparent[speed][rule] : imageManager.tField[speed][rule]);
+	matManager.mTexture.setTexture(0, drawField ? imageManager.tFieldTransparent[speed][(dInfo.duel_rule < 3) ? 2 : rule] : imageManager.tField[speed][(dInfo.duel_rule < 3) ? 2 : rule]);
 	driver->setMaterial(matManager.mTexture);
 	driver->drawVertexPrimitiveList(matManager.vField, 4, matManager.iRectangle, 2);
 	driver->setMaterial(matManager.mBackLine);
@@ -378,7 +378,7 @@ void Game::DrawCard(ClientCard* pcard) {
 }
 void Game::DrawMisc() {
 	static irr::core::vector3df act_rot(0, 0, 0);
-	int rule = (dInfo.duel_rule >= 4) ? 1 : 0;
+	int rule = (dInfo.duel_rule == 3) ? 0 : 1;
 	int speed = (dInfo.speed) ? 1 : 0;
 	irr::core::matrix4 im, ic, it;
 	act_rot.Z += 0.02f;

gframe/event_handler.cpp

@@ -2135,7 +2135,7 @@ void ClientField::GetHoverField(int x, int y) {
 		ofRect = recti(531+ 46, 135, 800- 46, 191);
 	}
 	irr::core::position2di pos(x, y);
-	int rule = (mainGame->dInfo.duel_rule >= 4) ? 1 : 0;
+	int rule = (mainGame->dInfo.duel_rule == 3) ? 0 : 1;
 	int speed = (mainGame->dInfo.speed) ? 1 : 0;
 	if(sfRect.isPointInside(pos)) {
 		int hc = hand[0].size();

gframe/image_manager.cpp

@@ -37,10 +37,14 @@ bool ImageManager::Initial() {
 	tFieldTransparent[0][0] = driver->getTexture("textures/field-transparent2.png");
 	tField[0][1] = driver->getTexture("textures/field3.png");
 	tFieldTransparent[0][1] = driver->getTexture("textures/field-transparent3.png");
+	tField[0][2] = driver->getTexture("textures/field.png");
+	tFieldTransparent[0][2] = driver->getTexture("textures/field-transparent.png");
 	tField[1][0] = driver->getTexture("textures/fieldSP2.png");
 	tFieldTransparent[1][0] = driver->getTexture("textures/field-transparentSP2.png");
 	tField[1][1] = driver->getTexture("textures/fieldSP3.png");
 	tFieldTransparent[1][1] = driver->getTexture("textures/field-transparentSP3.png");
+	tField[1][2] = driver->getTexture("textures/fieldSP.png");
+	tFieldTransparent[1][2] = driver->getTexture("textures/field-transparentSP.png");
 	return true;
 }
 void ImageManager::SetDevice(irr::IrrlichtDevice* dev) {

gframe/image_manager.h

@@ -41,8 +41,8 @@ public:
 	irr::video::ITexture* tBackGround;
 	irr::video::ITexture* tBackGround_menu;
 	irr::video::ITexture* tBackGround_deck;
-	irr::video::ITexture* tField[2][2];
-	irr::video::ITexture* tFieldTransparent[2][2];
+	irr::video::ITexture* tField[3][3];
+	irr::video::ITexture* tFieldTransparent[3][3];
 };
 
 extern ImageManager imageManager;