merge

gframe/CGUIButton.cpp

-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CGUIButton.h"
-#ifdef _IRR_COMPILE_WITH_GUI_
-
-#include "IGUISkin.h"
-#include "IGUIEnvironment.h"
-#include "IVideoDriver.h"
-#include "IGUIFont.h"
-#include "os.h"
-
-namespace irr
-{
-namespace gui
-{
-
-//! constructor
-CGUIButton::CGUIButton(IGUIEnvironment* environment, IGUIElement* parent,
-			s32 id, core::rect<s32> rectangle, bool noclip)
-: IGUIButton(environment, parent, id, rectangle),
-	SpriteBank(0), OverrideFont(0), Image(0), PressedImage(0),
-	ClickTime(0), HoverTime(0), FocusTime(0), 
-	IsPushButton(false), Pressed(false),
-	UseAlphaChannel(false), DrawBorder(true), ScaleImage(false)
-{
-	#ifdef _DEBUG
-	setDebugName("CGUIButton");
-	#endif
-	setNotClipped(noclip);
-
-	// Initialize the sprites.
-	for (u32 i=0; i<EGBS_COUNT; ++i)
-		ButtonSprites[i].Index = -1;
-
-	// This element can be tabbed.
-	setTabStop(true);
-	setTabOrder(-1);
-}
-
-
-//! destructor
-CGUIButton::~CGUIButton()
-{
-	if (OverrideFont)
-		OverrideFont->drop();
-
-	if (Image)
-		Image->drop();
-
-	if (PressedImage)
-		PressedImage->drop();
-
-	if (SpriteBank)
-		SpriteBank->drop();
-}
-
-
-//! Sets if the images should be scaled to fit the button
-void CGUIButton::setScaleImage(bool scaleImage)
-{
-	ScaleImage = scaleImage;
-}
-
-
-//! Returns whether the button scale the used images
-bool CGUIButton::isScalingImage() const
-{
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return ScaleImage;
-}
-
-
-//! Sets if the button should use the skin to draw its border
-void CGUIButton::setDrawBorder(bool border)
-{
-	DrawBorder = border;
-}
-
-
-void CGUIButton::setSpriteBank(IGUISpriteBank* sprites)
-{
-	if (sprites)
-		sprites->grab();
-
-	if (SpriteBank)
-		SpriteBank->drop();
-
-	SpriteBank = sprites;
-}
-
-
-void CGUIButton::setSprite(EGUI_BUTTON_STATE state, s32 index, video::SColor color, bool loop)
-{
-	if (SpriteBank)
-	{
-		ButtonSprites[(u32)state].Index	= index;
-		ButtonSprites[(u32)state].Color	= color;
-		ButtonSprites[(u32)state].Loop	= loop;
-	}
-	else
-	{
-		ButtonSprites[(u32)state].Index = -1;
-	}
-}
-
-
-//! called if an event happened.
-bool CGUIButton::OnEvent(const SEvent& event)
-{
-	if (!isEnabled())
-		return IGUIElement::OnEvent(event);
-
-	switch(event.EventType)
-	{
-	case EET_KEY_INPUT_EVENT:
-		if (event.KeyInput.PressedDown &&
-			(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
-		{
-			if (!IsPushButton)
-				setPressed(true);
-			else
-				setPressed(!Pressed);
-
-			return true;
-		}
-		if (Pressed && !IsPushButton && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
-		{
-			setPressed(false);
-			return true;
-		}
-		else
-		if (!event.KeyInput.PressedDown && Pressed &&
-			(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
-		{
-
-			if (!IsPushButton)
-				setPressed(false);
-
-			if (Parent)
-			{
-				SEvent newEvent;
-				newEvent.EventType = EET_GUI_EVENT;
-				newEvent.GUIEvent.Caller = this;
-				newEvent.GUIEvent.Element = 0;
-				newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
-				Parent->OnEvent(newEvent);
-			}
-			return true;
-		}
-		break;
-	case EET_GUI_EVENT:
-		if (event.GUIEvent.Caller == this)
-		{
-			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
-			{
-				if (!IsPushButton)
-					setPressed(false);
-				FocusTime = os::Timer::getTime();
-			}
-			else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUSED)
-			{
-				FocusTime = os::Timer::getTime();				
-			}
-			else if (event.GUIEvent.EventType == EGET_ELEMENT_HOVERED || event.GUIEvent.EventType == EGET_ELEMENT_LEFT)
-			{
-				HoverTime = os::Timer::getTime();
-			}
-		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
-		{
-			if (Environment->hasFocus(this) &&
-				!AbsoluteClippingRect.isPointInside(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y)))
-			{
-					Environment->removeFocus(this);
-					return false;
-			}
-
-			if (!IsPushButton)
-				setPressed(true);
-
-			Environment->setFocus(this);
-			return true;
-		}
-		else
-		if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
-		{
-			bool wasPressed = Pressed;
-
-			if ( !AbsoluteClippingRect.isPointInside( core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y ) ) )
-			{
-				if (!IsPushButton)
-					setPressed(false);
-				return true;
-			}
-
-			if (!IsPushButton)
-				setPressed(false);
-			else
-			{
-				setPressed(!Pressed);
-			}
-
-			if ((!IsPushButton && wasPressed && Parent) ||
-				(IsPushButton && wasPressed != Pressed))
-			{
-				SEvent newEvent;
-				newEvent.EventType = EET_GUI_EVENT;
-				newEvent.GUIEvent.Caller = this;
-				newEvent.GUIEvent.Element = 0;
-				newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
-				Parent->OnEvent(newEvent);
-			}
-
-			return true;
-		}
-		break;
-	default:
-		break;
-	}
-
-	return Parent ? Parent->OnEvent(event) : false;
-}
-
-
-//! draws the element and its children
-void CGUIButton::draw()
-{
-	
-}
-
-
-//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
-void CGUIButton::setOverrideFont(IGUIFont* font)
-{
-	if (OverrideFont == font)
-		return;
-
-	if (OverrideFont)
-		OverrideFont->drop();
-
-	OverrideFont = font;
-
-	if (OverrideFont)
-		OverrideFont->grab();
-}
-
-//! Gets the override font (if any)
-IGUIFont * CGUIButton::getOverrideFont() const
-{
-	return OverrideFont;
-}
-
-//! Get the font which is used right now for drawing
-IGUIFont* CGUIButton::getActiveFont() const
-{
-	if ( OverrideFont )
-		return OverrideFont;
-	IGUISkin* skin = Environment->getSkin();
-	if (skin)
-		return skin->getFont(EGDF_BUTTON);
-	return 0;
-}
-
-//! Sets an image which should be displayed on the button when it is in normal state.
-void CGUIButton::setImage(video::ITexture* image)
-{
-	if (image)
-		image->grab();
-	if (Image)
-		Image->drop();
-
-	Image = image;
-	if (image)
-		ImageRect = core::rect<s32>(core::position2d<s32>(0,0), image->getOriginalSize());
-
-	if (!PressedImage)
-		setPressedImage(Image);
-}
-
-
-//! Sets the image which should be displayed on the button when it is in its normal state.
-void CGUIButton::setImage(video::ITexture* image, const core::rect<s32>& pos)
-{
-	setImage(image);
-	ImageRect = pos;
-}
-
-
-//! Sets an image which should be displayed on the button when it is in pressed state.
-void CGUIButton::setPressedImage(video::ITexture* image)
-{
-	if (image)
-		image->grab();
-
-	if (PressedImage)
-		PressedImage->drop();
-
-	PressedImage = image;
-	if (image)
-		PressedImageRect = core::rect<s32>(core::position2d<s32>(0,0), image->getOriginalSize());
-}
-
-
-//! Sets the image which should be displayed on the button when it is in its pressed state.
-void CGUIButton::setPressedImage(video::ITexture* image, const core::rect<s32>& pos)
-{
-	setPressedImage(image);
-	PressedImageRect = pos;
-}
-
-
-//! Sets if the button should behave like a push button. Which means it
-//! can be in two states: Normal or Pressed. With a click on the button,
-//! the user can change the state of the button.
-void CGUIButton::setIsPushButton(bool isPushButton)
-{
-	IsPushButton = isPushButton;
-}
-
-
-//! Returns if the button is currently pressed
-bool CGUIButton::isPressed() const
-{
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return Pressed;
-}
-
-
-//! Sets the pressed state of the button if this is a pushbutton
-void CGUIButton::setPressed(bool pressed)
-{
-	if (Pressed != pressed)
-	{
-		ClickTime = os::Timer::getTime();
-		Pressed = pressed;
-	}
-}
-
-
-//! Returns whether the button is a push button
-bool CGUIButton::isPushButton() const
-{
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return IsPushButton;
-}
-
-
-//! Sets if the alpha channel should be used for drawing images on the button (default is false)
-void CGUIButton::setUseAlphaChannel(bool useAlphaChannel)
-{
-	UseAlphaChannel = useAlphaChannel;
-}
-
-
-//! Returns if the alpha channel should be used for drawing images on the button
-bool CGUIButton::isAlphaChannelUsed() const
-{
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return UseAlphaChannel;
-}
-
-
-bool CGUIButton::isDrawingBorder() const
-{
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return DrawBorder;
-}
-
-
-//! Writes attributes of the element.
-void CGUIButton::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
-{
-	IGUIButton::serializeAttributes(out,options);
-
-	out->addBool	("PushButton",		IsPushButton );
-	if (IsPushButton)
-		out->addBool("Pressed",		Pressed);
-
-	out->addTexture ("Image",		Image);
-	out->addRect	("ImageRect",		ImageRect);
-	out->addTexture	("PressedImage",	PressedImage);
-	out->addRect	("PressedImageRect",	PressedImageRect);
-
-	out->addBool	("UseAlphaChannel",	isAlphaChannelUsed());
-	out->addBool	("Border",		isDrawingBorder());
-	out->addBool	("ScaleImage",		isScalingImage());
-
-	//   out->addString  ("OverrideFont",	OverrideFont);
-}
-
-
-//! Reads attributes of the element
-void CGUIButton::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
-{
-	IGUIButton::deserializeAttributes(in,options);
-
-	IsPushButton	= in->getAttributeAsBool("PushButton");
-	Pressed		= IsPushButton ? in->getAttributeAsBool("Pressed") : false;
-
-	core::rect<s32> rec = in->getAttributeAsRect("ImageRect");
-	if (rec.isValid())
-		setImage( in->getAttributeAsTexture("Image"), rec);
-	else
-		setImage( in->getAttributeAsTexture("Image") );
-
-	rec = in->getAttributeAsRect("PressedImageRect");
-	if (rec.isValid())
-		setPressedImage( in->getAttributeAsTexture("PressedImage"), rec);
-	else
-		setPressedImage( in->getAttributeAsTexture("PressedImage") );
-
-	setDrawBorder(in->getAttributeAsBool("Border"));
-	setUseAlphaChannel(in->getAttributeAsBool("UseAlphaChannel"));
-	setScaleImage(in->getAttributeAsBool("ScaleImage"));
-
-	//   setOverrideFont(in->getAttributeAsString("OverrideFont"));
-
-	updateAbsolutePosition();
-}
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif // _IRR_COMPILE_WITH_GUI_
-

gframe/CGUIEditBox.h

-// Copyright (C) 2002-2010 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_GUI_EDIT_BOX_H_INCLUDED__
-#define __C_GUI_EDIT_BOX_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_GUI_
-
-#include "IGUIEditBox.h"
-#include "irrArray.h"
-#include "IOSOperator.h"
-
-namespace irr
-{
-namespace gui
-{
-	class CGUIEditBox : public IGUIEditBox
-	{
-	public:
-
-		//! constructor
-		CGUIEditBox(const wchar_t* text, bool border, IGUIEnvironment* environment,
-			IGUIElement* parent, s32 id, const core::rect<s32>& rectangle);
-
-		//! destructor
-		virtual ~CGUIEditBox();
-
-		//! Sets another skin independent font.
-		virtual void setOverrideFont(IGUIFont* font=0);
-
-		//! Sets another color for the text.
-		virtual void setOverrideColor(video::SColor color);
-
-		//! Sets if the text should use the overide color or the
-		//! color in the gui skin.
-		virtual void enableOverrideColor(bool enable);
-
-		//! Turns the border on or off
-		virtual void setDrawBorder(bool border);
-
-		//! Enables or disables word wrap for using the edit box as multiline text editor.
-		virtual void setWordWrap(bool enable);
-
-		//! Checks if word wrap is enabled
-		//! \return true if word wrap is enabled, false otherwise
-		virtual bool isWordWrapEnabled() const;
-
-		//! Enables or disables newlines.
-		/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
-		instead a newline character will be inserted. */
-		virtual void setMultiLine(bool enable);
-
-		//! Checks if multi line editing is enabled
-		//! \return true if mult-line is enabled, false otherwise
-		virtual bool isMultiLineEnabled() const;
-
-		//! Enables or disables automatic scrolling with cursor position
-		//! \param enable: If set to true, the text will move around with the cursor position
-		virtual void setAutoScroll(bool enable);
-
-		//! Checks to see if automatic scrolling is enabled
-		//! \return true if automatic scrolling is enabled, false if not
-		virtual bool isAutoScrollEnabled() const;
-
-		//! Gets the size area of the text in the edit box
-		//! \return Returns the size in pixels of the text
-		virtual core::dimension2du getTextDimension();
-
-		//! Sets text justification
-		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical);
-
-		//! called if an event happened.
-		virtual bool OnEvent(const SEvent& event);
-
-		//! draws the element and its children
-		virtual void draw();
-
-		//! Sets the new caption of this element.
-		virtual void setText(const wchar_t* text);
-
-		//! Sets the maximum amount of characters which may be entered in the box.
-		//! \param max: Maximum amount of characters. If 0, the character amount is
-		//! infinity.
-		virtual void setMax(u32 max);
-
-		//! Returns maximum amount of characters, previously set by setMax();
-		virtual u32 getMax() const;
-
-		//! Sets whether the edit box is a password box. Setting this to true will
-		/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
-		\param passwordBox: true to enable password, false to disable
-		\param passwordChar: the character that is displayed instead of letters */
-		virtual void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*');
-
-		//! Returns true if the edit box is currently a password box.
-		virtual bool isPasswordBox() const;
-
-		//! Updates the absolute position, splits text if required
-		virtual void updateAbsolutePosition();
-
-		//! Writes attributes of the element.
-		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
-
-		//! Reads attributes of the element
-		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
-
-	protected:
-		//! Breaks the single text line.
-		void breakText();
-		//! sets the area of the given line
-		void setTextRect(s32 line);
-		//! returns the line number that the cursor is on
-		s32 getLineFromPos(s32 pos);
-		//! adds a letter to the edit box
-		void inputChar(wchar_t c);
-		//! calculates the current scroll position
-		void calculateScrollPos();
-		//! send some gui event to parent
-		void sendGuiEvent(EGUI_EVENT_TYPE type);
-		//! set text markers
-		void setTextMarkers(s32 begin, s32 end);
-
-		bool processKey(const SEvent& event);
-		bool processMouse(const SEvent& event);
-		s32 getCursorPos(s32 x, s32 y);
-
-		bool MouseMarking;
-		bool Border;
-		bool OverrideColorEnabled;
-		s32 MarkBegin;
-		s32 MarkEnd;
-
-		video::SColor OverrideColor;
-		gui::IGUIFont *OverrideFont, *LastBreakFont;
-		IOSOperator* Operator;
-
-		u32 BlinkStartTime;
-		s32 CursorPos;
-		s32 HScrollPos, VScrollPos; // scroll position in characters
-		u32 Max;
-
-		bool WordWrap, MultiLine, AutoScroll, PasswordBox;
-		wchar_t PasswordChar;
-		EGUI_ALIGNMENT HAlign, VAlign;
-
-		core::array< core::stringw > BrokenText;
-		core::array< s32 > BrokenTextPositions;
-
-		core::rect<s32> CurrentTextRect, FrameRect; // temporary values
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif // _IRR_COMPILE_WITH_GUI_
-#endif // __C_GUI_EDIT_BOX_H_INCLUDED__
-

gframe/CIrrDeviceStub.h

-// Copyright (C) 2002-2010 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_IRR_DEVICE_STUB_H_INCLUDED__
-#define __C_IRR_DEVICE_STUB_H_INCLUDED__
-
-#include "IrrlichtDevice.h"
-#include "IImagePresenter.h"
-#include "SIrrCreationParameters.h"
-#include "CVideoModeList.h"
-
-namespace irr
-{
-	// lots of prototypes:
-	class ILogger;
-	class CLogger;
-
-	namespace gui
-	{
-		class IGUIEnvironment;
-		IGUIEnvironment* createGUIEnvironment(io::IFileSystem* fs,
-			video::IVideoDriver* Driver, IOSOperator* op);
-	}
-
-	namespace scene
-	{
-		ISceneManager* createSceneManager(video::IVideoDriver* driver,
-			io::IFileSystem* fs, gui::ICursorControl* cc, gui::IGUIEnvironment *gui);
-	}
-
-	namespace io
-	{
-		IFileSystem* createFileSystem();
-	}
-
-	namespace video
-	{
-		IVideoDriver* createSoftwareDriver(const core::dimension2d<u32>& windowSize,
-				bool fullscreen, io::IFileSystem* io,
-				video::IImagePresenter* presenter);
-		IVideoDriver* createSoftwareDriver2(const core::dimension2d<u32>& windowSize,
-				bool fullscreen, io::IFileSystem* io,
-				video::IImagePresenter* presenter);
-		IVideoDriver* createNullDriver(io::IFileSystem* io, const core::dimension2d<u32>& screenSize);
-	}
-
-
-
-	//! Stub for an Irrlicht Device implementation
-	class CIrrDeviceStub : public IrrlichtDevice
-	{
-	public:
-
-		//! constructor
-		CIrrDeviceStub(const SIrrlichtCreationParameters& param);
-
-		//! destructor
-		virtual ~CIrrDeviceStub();
-
-		//! returns the video driver
-		virtual video::IVideoDriver* getVideoDriver();
-
-		//! return file system
-		virtual io::IFileSystem* getFileSystem();
-
-		//! returns the gui environment
-		virtual gui::IGUIEnvironment* getGUIEnvironment();
-
-		//! returns the scene manager
-		virtual scene::ISceneManager* getSceneManager();
-
-		//! \return Returns a pointer to the mouse cursor control interface.
-		virtual gui::ICursorControl* getCursorControl();
-
-		//! Returns a pointer to a list with all video modes supported by the gfx adapter.
-		virtual video::IVideoModeList* getVideoModeList();
-
-		//! Returns a pointer to the ITimer object. With it the current Time can be received.
-		virtual ITimer* getTimer();
-
-		//! Returns the version of the engine.
-		virtual const char* getVersion() const;
-
-		//! send the event to the right receiver
-		virtual bool postEventFromUser(const SEvent& event);
-
-		//! Sets a new event receiver to receive events
-		virtual void setEventReceiver(IEventReceiver* receiver);
-
-		//! Returns pointer to the current event receiver. Returns 0 if there is none.
-		virtual IEventReceiver* getEventReceiver();
-
-		//! Sets the input receiving scene manager.
-		/** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */
-		virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager);
-
-		//! Returns a pointer to the logger.
-		virtual ILogger* getLogger();
-
-		//! Returns the operation system opertator object.
-		virtual IOSOperator* getOSOperator();
-
-		//! Checks if the window is running in fullscreen mode.
-		virtual bool isFullscreen() const;
-
-		//! get color format of the current window
-		virtual video::ECOLOR_FORMAT getColorFormat() const;
-
-		//! Activate any joysticks, and generate events for them.
-		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
-
-		//! Set the current Gamma Value for the Display
-		virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast );
-
-		//! Get the current Gamma Value for the Display
-		virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast );
-
-		//! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behaviour.
-		//! When set to 0 no double- and tripleclicks will be generated.
-		virtual void setDoubleClickTime( u32 timeMs );
-
-		//! Get the maximal elapsed time between 2 clicks to generate double- and tripleclicks for the mouse.
-		virtual u32 getDoubleClickTime() const;
-
-		//! Remove all messages pending in the system message loop
-		virtual void clearSystemMessages();
-
-
-	protected:
-
-		void createGUIAndScene();
-
-		//! checks version of SDK and prints warning if there might be a problem
-		bool checkVersion(const char* version);
-
-		//! Compares to the last call of this function to return double and triple clicks.
-		//! \return Returns only 1,2 or 3. A 4th click will start with 1 again.
-		virtual u32 checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent );
-
-		void calculateGammaRamp ( u16 *ramp, f32 gamma, f32 relativebrightness, f32 relativecontrast );
-		void calculateGammaFromRamp ( f32 &gamma, const u16 *ramp );
-
-		video::IVideoDriver* VideoDriver;
-		gui::IGUIEnvironment* GUIEnvironment;
-		scene::ISceneManager* SceneManager;
-		ITimer* Timer;
-		gui::ICursorControl* CursorControl;
-		IEventReceiver* UserReceiver;
-		CLogger* Logger;
-		IOSOperator* Operator;
-		io::IFileSystem* FileSystem;
-		scene::ISceneManager* InputReceivingSceneManager;
-
-		struct SMouseMultiClicks
-		{
-			SMouseMultiClicks()
-				: DoubleClickTime(500), CountSuccessiveClicks(0), LastClickTime(0), LastMouseInputEvent(EMIE_COUNT)
-			{}
-
-			u32 DoubleClickTime;
-			u32 CountSuccessiveClicks;
-			u32 LastClickTime;
-			core::position2di LastClick;
-			EMOUSE_INPUT_EVENT LastMouseInputEvent;
-		};
-		SMouseMultiClicks MouseMultiClicks;
-		video::CVideoModeList VideoModeList;
-		SIrrlichtCreationParameters CreationParams;
-		bool Close;
-	};
-
-} // end namespace irr
-
-#endif
-

gframe/COSOperator.cpp

-// Copyright (C) 2002-2010 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "COSOperator.h"
-
-#ifdef _IRR_WINDOWS_API_
-#ifndef _IRR_XBOX_PLATFORM_
-#include <windows.h>
-#endif
-#else
-#include <string.h>
-#include <unistd.h>
-#ifndef _IRR_SOLARIS_PLATFORM_
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#endif
-#endif
-
-#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-#include "CIrrDeviceLinux.h"
-#endif
-#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
-#include "MacOSX/OSXClipboard.h"
-#endif
-
-namespace irr
-{
-
-#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-// constructor  linux
-COSOperator::COSOperator(const c8* osversion, CIrrDeviceLinux* device)
-: IrrDeviceLinux(device)
-{
-}
-#endif
-
-// constructor
-COSOperator::COSOperator(const c8* osVersion) : OperatingSystem(osVersion)
-{
-	#ifdef _DEBUG
-	setDebugName("COSOperator");
-	#endif
-}
-
-
-//! returns the current operating system version as string.
-const wchar_t* COSOperator::getOperationSystemVersion() const
-{
-	return OperatingSystem.c_str();
-}
-
-
-//! copies text to the clipboard
-void COSOperator::copyToClipboard(const c8* text) const
-{
-	if (strlen(text)==0)
-		return;
-
-// Windows version
-#if defined(_IRR_XBOX_PLATFORM_)
-#elif defined(_IRR_WINDOWS_API_)
-	if (!OpenClipboard(NULL) || text == 0)
-		return;
-
-	EmptyClipboard();
-
-	HGLOBAL clipbuffer;
-	wchar_t* buffer;
-
-	clipbuffer = GlobalAlloc(GMEM_DDESHARE, (wcslen((wchar_t*)text)+1) * sizeof(wchar_t*));
-	buffer = (wchar_t*)GlobalLock(clipbuffer);
-
-	wcscpy(buffer, (wchar_t*)text);
-
-	GlobalUnlock(clipbuffer);
-	SetClipboardData(CF_UNICODETEXT, clipbuffer);
-	CloseClipboard();
-
-// MacOSX version
-#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
-
-	OSXCopyToClipboard(text);
-
-#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-    if ( IrrDeviceLinux )
-        IrrDeviceLinux->copyToClipboard(text);
-#else
-
-#endif
-}
-
-
-//! gets text from the clipboard
-//! \return Returns 0 if no string is in there.
-const c8* COSOperator::getTextFromClipboard() const
-{
-#if defined(_IRR_XBOX_PLATFORM_)
-		return 0;
-#elif defined(_IRR_WINDOWS_API_)
-	if (!OpenClipboard(NULL))
-		return 0;
-
-	char * buffer = 0;
-
-	HANDLE hData = GetClipboardData(CF_UNICODETEXT);
-	buffer = (char*)GlobalLock( hData );
-	GlobalUnlock( hData );
-	CloseClipboard();
-	return buffer;
-
-#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
-	return (OSXCopyFromClipboard());
-
-#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-    if ( IrrDeviceLinux )
-        return IrrDeviceLinux->getTextFromClipboard();
-    return 0;
-
-#else
-
-	return 0;
-#endif
-}
-
-
-bool COSOperator::getProcessorSpeedMHz(u32* MHz) const
-{
-#if defined(_IRR_WINDOWS_API_) && !defined(_WIN32_WCE ) && !defined (_IRR_XBOX_PLATFORM_)
-	LONG Error;
-
-	HKEY Key;
-	Error = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-			__TEXT("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"),
-			0, KEY_READ, &Key);
-
-	if(Error != ERROR_SUCCESS)
-		return false;
-
-	DWORD Speed = 0;
-	DWORD Size = sizeof(Speed);
-	Error = RegQueryValueEx(Key, __TEXT("~MHz"), NULL, NULL, (LPBYTE)&Speed, &Size);
-
-	RegCloseKey(Key);
-
-	if (Error != ERROR_SUCCESS)
-		return false;
-	else if (MHz)
-		*MHz = Speed;
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return true;
-
-#elif defined(_IRR_OSX_PLATFORM_)
-	struct clockinfo CpuClock;
-	size_t Size = sizeof(clockinfo);
-
-	if (!sysctlbyname("kern.clockrate", &CpuClock, &Size, NULL, 0))
-		return false;
-	else if (MHz)
-		*MHz = CpuClock.hz;
-	return true;
-#else
-	// could probably be read from "/proc/cpuinfo" or "/proc/cpufreq"
-
-	return false;
-#endif
-}
-
-bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const
-{
-#if defined(_IRR_WINDOWS_API_) && !defined (_IRR_XBOX_PLATFORM_)
-	MEMORYSTATUS MemoryStatus;
-	MemoryStatus.dwLength = sizeof(MEMORYSTATUS);
-
-	// cannot fail
-	GlobalMemoryStatus(&MemoryStatus);
-
-	if (Total)
-		*Total = (u32)(MemoryStatus.dwTotalPhys>>10);
-	if (Avail)
-		*Avail = (u32)(MemoryStatus.dwAvailPhys>>10);
-
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return true;
-
-#elif defined(_IRR_POSIX_API_) && !defined(__FreeBSD__)
-#if defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)
-        long ps = sysconf(_SC_PAGESIZE);
-        long pp = sysconf(_SC_PHYS_PAGES);
-        long ap = sysconf(_SC_AVPHYS_PAGES);
-
-	if ((ps==-1)||(pp==-1)||(ap==-1))
-		return false;
-
-	if (Total)
-		*Total = (u32)((ps*(long long)pp)>>10);
-	if (Avail)
-		*Avail = (u32)((ps*(long long)ap)>>10);
-	return true;
-#else
-	// TODO: implement for non-availablity of symbols/features
-	return false;
-#endif
-#else
-	// TODO: implement for OSX
-	return false;
-#endif
-}
-
-
-} // end namespace

gframe/COSOperator.h

-// Copyright (C) 2002-2010 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_OS_OPERATOR_H_INCLUDED__
-#define __C_OS_OPERATOR_H_INCLUDED__
-
-#include "IOSOperator.h"
-#include "irrString.h"
-#include "IrrCompileConfig.h"
-
-namespace irr
-{
-
-class CIrrDeviceLinux;
-
-//! The Operating system operator provides operation system specific methods and informations.
-class COSOperator : public IOSOperator
-{
-public:
-
-	// constructor
-#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-    COSOperator(const c8* osversion, CIrrDeviceLinux* device);
-#endif
- 	COSOperator(const c8* osversion);
-
-	//! returns the current operation system version as string.
-	virtual const wchar_t* getOperationSystemVersion() const;
-
-	//! copies text to the clipboard
-	virtual void copyToClipboard(const c8* text) const;
-
-	//! gets text from the clipboard
-	//! \return Returns 0 if no string is in there.
-	virtual const c8* getTextFromClipboard() const;
-
-	//! gets the processor speed in megahertz
-	//! \param Mhz:
-	//! \return Returns true if successful, false if not
-	virtual bool getProcessorSpeedMHz(u32* MHz) const;
-
-	//! gets the total and available system RAM in kB
-	//! \param Total: will contain the total system memory
-	//! \param Avail: will contain the available memory
-	//! \return Returns true if successful, false if not
-	virtual bool getSystemMemory(u32* Total, u32* Avail) const;
-
-private:
-
-	core::stringw OperatingSystem;
-
-#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-    CIrrDeviceLinux * IrrDeviceLinux;
-#endif
-
-};
-
-} // end namespace
-
-#endif
-

gframe/CTimer.h

-// Copyright (C) 2002-2010 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_IRR_C_TIMER_H_INCLUDED__
-#define __C_IRR_C_TIMER_H_INCLUDED__
-
-#include "ITimer.h"
-#include "os.h"
-
-namespace irr
-{
-	//! Device independent implementation of the timer
-	class CTimer : public ITimer
-	{
-	public:
-
-		CTimer()
-		{
-			os::Timer::initTimer();
-		}
-
-		//! Returns current real time in milliseconds of the system. 
-		/** This value does not start with 0 when the application starts.
-		For example in one implementation the value returned could be the 
-		amount of milliseconds which have elapsed since the system was started. */
-		virtual u32 getRealTime() const
-		{
-			return os::Timer::getRealTime();
-		}
-
-		//! Returns current virtual time in milliseconds. 
-		/** This value starts with 0 and can be manipulated using setTime(), stopTimer(),
-		startTimer(), etc. This value depends on the set speed of the timer if the timer 
-		is stopped, etc. If you need the system time, use getRealTime() */
-		virtual u32 getTime() const
-		{
-			return os::Timer::getTime();
-		}
-
-		//! sets current virtual time
-		virtual void setTime(u32 time)
-		{
-			os::Timer::setTime(time);
-		}
-
-		//! Stops the game timer. 
-		/** The timer is reference counted, which means everything which calls 
-		stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
-		corretly again. */
-		virtual void stop()
-		{
-			os::Timer::stopTimer();
-		}
-
-		//! Starts the game timer.
-		/** The timer is reference counted, which means everything which calls 
-		stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
-		corretly again. */
-		virtual void start()
-		{
-			os::Timer::startTimer();
-		}
-
-		//! Sets the speed of the timer
-		/** The speed is the factor with which the time is running faster or slower then the
-		real system time. */
-		virtual void setSpeed(f32 speed = 1.0f)
-		{
-			os::Timer::setSpeed(speed);
-		}
-
-		//! Returns current speed of the timer
-		/** The speed is the factor with which the time is running faster or slower then the
-		real system time. */
-		virtual f32 getSpeed() const
-		{
-			return os::Timer::getSpeed();
-		}
-
-		//! Returns if game timer is currently stopped
-		virtual bool isStopped() const
-		{
-			bool ret = os::Timer::isStopped();
-			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-			return ret;
-		}
-
-		//! Advances the virtual time
-		/** Makes the virtual timer update the time value based on the real time. This is
-		called automaticly when calling IrrlichtDevice::run(), but you can call it manually
-		if you don't use this method. */
-		virtual void tick()
-		{
-			os::Timer::tick();
-		}
-	};
-
-} // end namespace
-
-#endif
-

gframe/CVideoModeList.h

-// Copyright (C) 2002-2010 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __IRR_C_VIDEO_MODE_LIST_H_INCLUDED__
-#define __IRR_C_VIDEO_MODE_LIST_H_INCLUDED__
-
-#include "IVideoModeList.h"
-#include "dimension2d.h"
-#include "irrArray.h"
-
-namespace irr
-{
-namespace video
-{
-
-	class CVideoModeList : public IVideoModeList
-	{
-	public:
-
-		//! constructor
-		CVideoModeList();
-
-		//! Gets amount of video modes in the list.
-		virtual s32 getVideoModeCount() const;
-
-		//! Returns the screen size of a video mode in pixels.
-		virtual core::dimension2d<u32> getVideoModeResolution(s32 modeNumber) const;
-
-		//! Returns the screen size of an optimal video mode in pixels.
-		virtual core::dimension2d<u32> getVideoModeResolution(const core::dimension2d<u32>& minSize, const core::dimension2d<u32>& maxSize) const;
-
-		//! Returns the pixel depth of a video mode in bits.
-		virtual s32 getVideoModeDepth(s32 modeNumber) const;
-
-		//! Returns current desktop screen resolution.
-		virtual const core::dimension2d<u32>& getDesktopResolution() const;
-
-		//! Returns the pixel depth of a video mode in bits.
-		virtual s32 getDesktopDepth() const;
-
-		//! adds a new mode to the list
-		void addMode(const core::dimension2d<u32>& size, s32 depth);
-
-		void setDesktop(s32 desktopDepth, const core::dimension2d<u32>& desktopSize);
-
-	private:
-
-		struct SVideoMode
-		{
-			core::dimension2d<u32> size;
-			s32 depth;
-
-			bool operator==(const SVideoMode& other) const
-			{
-				return size == other.size && depth == other.depth;
-			}
-
-			bool operator <(const SVideoMode& other) const
-			{
-				return (size.Width < other.size.Width ||
-					(size.Width == other.size.Width &&
-					size.Height < other.size.Height) ||
-					(size.Width == other.size.Width &&
-					size.Height == other.size.Height &&
-					depth < other.depth));
-			}
-		};
-
-		core::array<SVideoMode> VideoModes;
-		SVideoMode Desktop;
-	};
-
-} // end namespace video
-} // end namespace irr
-
-
-#endif
-

gframe/IImagePresenter.h

-// Copyright (C) 2002-2010 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_IMAGE_PRESENTER_H_INCLUDED__
-#define __I_IMAGE_PRESENTER_H_INCLUDED__
-
-#include "IImage.h"
-
-namespace irr
-{
-namespace video  
-{
-
-/*!
-	Interface for a class which is able to present an IImage 
-	an the Screen. Usually only implemented by an IrrDevice for
-	presenting Software Device Rendered images.
-
-	This class should be used only internally.
-*/
-
-	class IImagePresenter
-	{
-	public:
-
-		virtual ~IImagePresenter() {};
-		//! presents a surface in the client area
-		virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0 ) = 0;
-	};
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-

gframe/client_card.cpp

@@ -30,11 +30,15 @@ ClientCard::ClientCard() {
 	defence = 0;
 	base_attack = 0;
 	base_defence = 0;
+	lscale = 0;
+	rscale = 0;
 	cHint = 0;
 	chValue = 0;
 	atkstring[0] = 0;
 	defstring[0] = 0;
 	lvstring[0] = 0;
+	rscstring[0] = 0;
+	lscstring[0] = 0;
 	overlayTarget = 0;
 	equipTarget = 0;
 }
@@ -147,6 +151,20 @@ void ClientCard::UpdateInfo(char* buf) {
 		is_disabled = BufferIO::ReadInt32(buf);
 	if(flag & QUERY_IS_PUBLIC)
 		is_public = BufferIO::ReadInt32(buf);
+	if(flag & QUERY_LSCALE) {
+		pdata = BufferIO::ReadInt32(buf);
+		if(pdata && lscale != (unsigned int)pdata) {
+			lscale = pdata;
+			myswprintf(lscstring, L"%d", lscale);
+		}
+	}
+	if(flag & QUERY_RSCALE) {
+		pdata = BufferIO::ReadInt32(buf);
+		if(pdata && rscale != (unsigned int)pdata) {
+			rscale = pdata;
+			myswprintf(rscstring, L"%d", rscale);
+		}
+	}
 }
 void ClientCard::ClearTarget() {
 	for(auto cit = cardTarget.begin(); cit != cardTarget.end(); ++cit) {

gframe/client_card.h

@@ -11,24 +11,28 @@ namespace ygo {
 struct CardData {
 	unsigned int code;
 	unsigned int alias;
-	unsigned int setcode;
+	unsigned long long setcode;
 	unsigned int type;
 	unsigned int level;
 	unsigned int attribute;
 	unsigned int race;
 	int attack;
 	int defence;
+	unsigned int lscale;
+	unsigned int rscale;
 };
 struct CardDataC {
 	unsigned int code;
 	unsigned int alias;
-	unsigned int setcode;
+	unsigned long long setcode;
 	unsigned int type;
 	unsigned int level;
 	unsigned int attribute;
 	unsigned int race;
 	int attack;
 	int defence;
+	unsigned int lscale;
+	unsigned int rscale;
 	unsigned int ot;
 	unsigned int category;
 };
@@ -70,6 +74,8 @@ public:
 	s32 defence;
 	s32 base_attack;
 	s32 base_defence;
+	u32 lscale;
+	u32 rscale;
 	u32 reason;
 	u32 select_seq;
 	u8 owner;
@@ -95,6 +101,8 @@ public:
 	wchar_t atkstring[16];
 	wchar_t defstring[16];
 	wchar_t lvstring[16];
+	wchar_t lscstring[16];
+	wchar_t rscstring[16];
 
 	ClientCard();
 	void SetCode(int code);

gframe/client_field.h

@@ -64,6 +64,7 @@ public:
 	bool remove_act;
 	bool deck_act;
 	bool extra_act;
+	bool pzone_act;
 	bool chain_forced;
 	ChainInfo current_chain;
 	bool last_chain;

gframe/data_manager.cpp

@@ -27,11 +27,14 @@ bool DataManager::LoadDB(const char* file) {
 			cd.code = sqlite3_column_int(pStmt, 0);
 			cd.ot = sqlite3_column_int(pStmt, 1);
 			cd.alias = sqlite3_column_int(pStmt, 2);
-			cd.setcode = sqlite3_column_int(pStmt, 3);
+			cd.setcode = sqlite3_column_int64(pStmt, 3);
 			cd.type = sqlite3_column_int(pStmt, 4);
 			cd.attack = sqlite3_column_int(pStmt, 5);
 			cd.defence = sqlite3_column_int(pStmt, 6);
-			cd.level = sqlite3_column_int(pStmt, 7);
+			unsigned int level = sqlite3_column_int(pStmt, 7);
+			cd.level = level & 0xff;
+			cd.lscale = (level >> 24) & 0xff;
+			cd.rscale = (level >> 16) & 0xff;
 			cd.race = sqlite3_column_int(pStmt, 8);
 			cd.attribute = sqlite3_column_int(pStmt, 9);
 			cd.category = sqlite3_column_int(pStmt, 10);
@@ -54,7 +57,7 @@ bool DataManager::LoadDB(const char* file) {
 				if(len) {
 					cs.desc[i - 14] = new wchar_t[len + 1];
 					memcpy(cs.desc[i - 14], strBuffer, (len + 1)*sizeof(wchar_t));
-				} else break;
+				} else cs.desc[i - 14] = 0;
 			}
 			_strings.insert(std::make_pair(cd.code, cs));
 		}
@@ -212,7 +215,7 @@ const wchar_t* DataManager::FormatAttribute(int attribute) {
 const wchar_t* DataManager::FormatRace(int race) {
 	wchar_t* p = racBuffer;
 	int filter = 1, i = 1020;
-	for(; filter != 0x800000; filter <<= 1, ++i) {
+	for(; filter != 0x1000000; filter <<= 1, ++i) {
 		if(race & filter) {
 			BufferIO::CopyWStrRef(GetSysString(i), p, 16);
 			*p = L'|';
@@ -228,7 +231,7 @@ const wchar_t* DataManager::FormatRace(int race) {
 const wchar_t* DataManager::FormatType(int type) {
 	wchar_t* p = tpBuffer;
 	int filter = 1, i = 1050;
-	for(; filter != 0x1000000; filter <<= 1, ++i) {
+	for(; filter != 0x2000000; filter <<= 1, ++i) {
 		if(type & filter) {
 			BufferIO::CopyWStrRef(GetSysString(i), p, 16);
 			*p = L'|';

gframe/deck_con.cpp

@@ -260,6 +260,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					break;
 				}
 				case 1: {
+					wchar_t syntuner[32];
 					mainGame->cbCardType2->setEnabled(true);
 					mainGame->cbRace->setEnabled(true);
 					mainGame->cbAttribute->setEnabled(true);
@@ -273,7 +274,10 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					mainGame->cbCardType2->addItem(dataManager.GetSysString(1056), TYPE_MONSTER + TYPE_FUSION);
 					mainGame->cbCardType2->addItem(dataManager.GetSysString(1057), TYPE_MONSTER + TYPE_RITUAL);
 					mainGame->cbCardType2->addItem(dataManager.GetSysString(1063), TYPE_MONSTER + TYPE_SYNCHRO);
+					myswprintf(syntuner, L"%ls|%ls", dataManager.GetSysString(1063), dataManager.GetSysString(1062));
+					mainGame->cbCardType2->addItem(syntuner, TYPE_MONSTER + TYPE_SYNCHRO + TYPE_TUNER);
 					mainGame->cbCardType2->addItem(dataManager.GetSysString(1073), TYPE_MONSTER + TYPE_XYZ);
+					mainGame->cbCardType2->addItem(dataManager.GetSysString(1074), TYPE_MONSTER + TYPE_PENDULUM);
 					mainGame->cbCardType2->addItem(dataManager.GetSysString(1062), TYPE_MONSTER + TYPE_TUNER);
 					mainGame->cbCardType2->addItem(dataManager.GetSysString(1061), TYPE_MONSTER + TYPE_DUAL);
 					mainGame->cbCardType2->addItem(dataManager.GetSysString(1060), TYPE_MONSTER + TYPE_UNION);

gframe/duelclient.cpp

@@ -976,6 +976,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				mainGame->dField.remove_act = true;
 			if (pcard->location == LOCATION_EXTRA)
 				mainGame->dField.extra_act = true;
+			if (pcard->location == LOCATION_SZONE && pcard->sequence == 6)
+				mainGame->dField.pzone_act = true;
 		}
 		mainGame->dField.reposable_cards.clear();
 		count = BufferIO::ReadInt8(pbuf);
@@ -1206,6 +1208,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		mainGame->dField.selectable_field = ~BufferIO::ReadInt32(pbuf);
 		mainGame->dField.selected_field = 0;
 		unsigned char respbuf[64];
+		int pzone = 0;
 		if (mainGame->dInfo.curMsg == MSG_SELECT_PLACE && mainGame->chkAutoPos->isChecked()) {
 			int filter;
 			if (mainGame->dField.selectable_field & 0x1f) {
@@ -1216,25 +1219,40 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				respbuf[0] = mainGame->dInfo.isFirst ? 0 : 1;
 				respbuf[1] = 0x8;
 				filter = (mainGame->dField.selectable_field >> 8) & 0x1f;
+			} else if (mainGame->dField.selectable_field & 0xc000) {
+				respbuf[0] = mainGame->dInfo.isFirst ? 0 : 1;
+				respbuf[1] = 0x8;
+				filter = (mainGame->dField.selectable_field >> 14) & 0x3;
+				pzone = 1;
 			} else if (mainGame->dField.selectable_field & 0x1f0000) {
 				respbuf[0] = mainGame->dInfo.isFirst ? 1 : 0;
 				respbuf[1] = 0x4;
 				filter = (mainGame->dField.selectable_field >> 16) & 0x1f;
-			} else {
+			} else if (mainGame->dField.selectable_field & 0x1f000000) {
 				respbuf[0] = mainGame->dInfo.isFirst ? 1 : 0;
 				respbuf[1] = 0x8;
 				filter = (mainGame->dField.selectable_field >> 24) & 0x1f;
+			} else {
+				respbuf[0] = mainGame->dInfo.isFirst ? 1 : 0;
+				respbuf[1] = 0x8;
+				filter = (mainGame->dField.selectable_field >> 30) & 0x3;
+				pzone = 1;
 			}
-			if(mainGame->chkRandomPos->isChecked()) {
-				respbuf[2] = rnd.real() * 5;
-				while(!(filter & (1 << respbuf[2])))
+			if(!pzone) {
+				if(mainGame->chkRandomPos->isChecked()) {
 					respbuf[2] = rnd.real() * 5;
+					while(!(filter & (1 << respbuf[2])))
+						respbuf[2] = rnd.real() * 5;
+				} else {
+					if (filter & 0x4) respbuf[2] = 2;
+					else if (filter & 0x2) respbuf[2] = 1;
+					else if (filter & 0x8) respbuf[2] = 3;
+					else if (filter & 0x1) respbuf[2] = 0;
+					else if (filter & 0x10) respbuf[2] = 4;
+				}
 			} else {
-				if (filter & 0x4) respbuf[2] = 2;
-				else if (filter & 0x2) respbuf[2] = 1;
-				else if (filter & 0x8) respbuf[2] = 3;
-				else if (filter & 0x1) respbuf[2] = 0;
-				else if (filter & 0x10) respbuf[2] = 4;
+				if (filter & 0x1) respbuf[2] = 6;
+				else if (filter & 0x2) respbuf[2] = 7;
 			}
 			mainGame->dField.selectable_field = 0;
 			SetResponseB(respbuf, 3);
@@ -1407,6 +1425,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			mainGame->dField.sort_list.push_back(0);
 		}
 		if (mainGame->chkAutoChain->isChecked() && mainGame->dInfo.curMsg == MSG_SORT_CHAIN) {
+			mainGame->dField.sort_list.clear();
 			SetResponseI(-1);
 			DuelClient::SendResponse();
 			return true;
@@ -1641,8 +1660,16 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			mainGame->dField.grave[player].swap(mainGame->dField.deck[player]);
 			for (auto cit = mainGame->dField.grave[player].begin(); cit != mainGame->dField.grave[player].end(); ++cit)
 				(*cit)->location = LOCATION_GRAVE;
-			for (auto cit = mainGame->dField.deck[player].begin(); cit != mainGame->dField.deck[player].end(); ++cit)
-				(*cit)->location = LOCATION_DECK;
+			for (auto cit = mainGame->dField.deck[player].begin(); cit != mainGame->dField.deck[player].end(); ) {
+				if ((*cit)->type & 0x802040) {
+					(*cit)->location = LOCATION_EXTRA;
+					mainGame->dField.extra[player].push_back(*cit);
+					cit = mainGame->dField.deck[player].erase(cit);
+				} else {
+					(*cit)->location = LOCATION_DECK;
+					++cit;
+				}
+			}
 		} else {
 			mainGame->gMutex.Lock();
 			mainGame->dField.grave[player].swap(mainGame->dField.deck[player]);
@@ -1650,9 +1677,17 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				(*cit)->location = LOCATION_GRAVE;
 				mainGame->dField.MoveCard(*cit, 10);
 			}
-			for (auto cit = mainGame->dField.deck[player].begin(); cit != mainGame->dField.deck[player].end(); ++cit) {
-				(*cit)->location = LOCATION_DECK;
-				mainGame->dField.MoveCard(*cit, 10);
+			for (auto cit = mainGame->dField.deck[player].begin(); cit != mainGame->dField.deck[player].end(); ) {
+				ClientCard* pcard = *cit;
+				if (pcard->type & 0x802040) {
+					pcard->location = LOCATION_EXTRA;
+					mainGame->dField.extra[player].push_back(pcard);
+					cit = mainGame->dField.deck[player].erase(cit);
+				} else {
+					pcard->location = LOCATION_DECK;
+					++cit;
+				}
+				mainGame->dField.MoveCard(pcard, 10);
 			}
 			mainGame->gMutex.Unlock();
 			mainGame->WaitFrameSignal(11);
@@ -1849,7 +1884,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		} else {
 			if (!(pl & 0x80) && !(cl & 0x80)) {
 				ClientCard* pcard = mainGame->dField.GetCard(pc, pl, ps);
-				if (code != 0 && pcard->code != code)
+				if (pcard->code != code && (code != 0 || cl == 0x40))
 					pcard->SetCode(code);
 				pcard->cHint = 0;
 				pcard->chValue = 0;
@@ -2737,7 +2772,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		/*int player = */mainGame->LocalPlayer(BufferIO::ReadInt8(pbuf));
 		mainGame->dField.announce_count = BufferIO::ReadInt8(pbuf);
 		int available = BufferIO::ReadInt32(pbuf);
-		for(int i = 0, filter = 0x1; i < 23; ++i, filter <<= 1) {
+		for(int i = 0, filter = 0x1; i < 24; ++i, filter <<= 1) {
 			mainGame->chkRace[i]->setChecked(false);
 			if(filter & available)
 				mainGame->chkRace[i]->setVisible(true);
@@ -2987,7 +3022,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 					}
 				}
 			}
-			for(int seq = 0; seq < 6; ++seq) {
+			for(int seq = 0; seq < 8; ++seq) {
 				val = BufferIO::ReadInt8(pbuf);
 				if(val) {
 					ClientCard* ccard = new ClientCard;

gframe/game.cpp

@@ -15,7 +15,7 @@
 #include <unistd.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x1321;
+const unsigned short PRO_VERSION = 0x1330;
 
 namespace ygo {
 
@@ -76,6 +76,7 @@ bool Game::Initialize() {
 	deckManager.LoadLFList();
 	driver = device->getVideoDriver();
 	driver->setTextureCreationFlag(irr::video::ETCF_CREATE_MIP_MAPS, false);
+	driver->setTextureCreationFlag(irr::video::ETCF_OPTIMIZED_FOR_QUALITY, true);
 	imageManager.SetDevice(device);
 	if(!imageManager.Initial())
 		return false;
@@ -203,7 +204,7 @@ bool Game::Initialize() {
 	imgCard = env->addImage(rect<s32>(9, 9, 187, 262), wCardImg);
 	imgCard->setUseAlphaChannel(true);
 	//phase
-	wPhase = env->addStaticText(L"", rect<s32>(475, 310, 850, 330));
+	wPhase = env->addStaticText(L"", rect<s32>(455, 310, 830, 330));
 	wPhase->setVisible(false);
 	btnDP = env->addButton(rect<s32>(0, 0, 50, 20), wPhase, -1, L"\xff24\xff30");
 	btnDP->setEnabled(false);
@@ -358,7 +359,7 @@ bool Game::Initialize() {
 	wANRace = env->addWindow(rect<s32>(480, 200, 850, 385), false, dataManager.GetSysString(563));
 	wANRace->getCloseButton()->setVisible(false);
 	wANRace->setVisible(false);
-	for(int filter = 0x1, i = 0; i < 23; filter <<= 1, ++i)
+	for(int filter = 0x1, i = 0; i < 24; filter <<= 1, ++i)
 		chkRace[i] = env->addCheckBox(false, rect<s32>(10 + (i % 4) * 90, 25 + (i / 4) * 25, 100 + (i % 4) * 90, 50 + (i / 4) * 25),
 		                              wANRace, CHECK_RACE, dataManager.FormatRace(filter));
 	//selection hint
@@ -411,7 +412,7 @@ bool Game::Initialize() {
 	cbCardType->addItem(dataManager.GetSysString(1312));
 	cbCardType->addItem(dataManager.GetSysString(1313));
 	cbCardType->addItem(dataManager.GetSysString(1314));
-	cbCardType2 = env->addComboBox(rect<s32>(130, 3, 190, 23), wFilter, -1);
+	cbCardType2 = env->addComboBox(rect<s32>(125, 3, 200, 23), wFilter, -1);
 	cbCardType2->addItem(dataManager.GetSysString(1310), 0);
 	env->addStaticText(dataManager.GetSysString(1315), rect<s32>(205, 5, 280, 25), false, false, wFilter);
 	cbLimit = env->addComboBox(rect<s32>(260, 3, 390, 23), wFilter, -1);
@@ -429,7 +430,7 @@ bool Game::Initialize() {
 	env->addStaticText(dataManager.GetSysString(1321), rect<s32>(10, 51, 70, 71), false, false, wFilter);
 	cbRace = env->addComboBox(rect<s32>(60, 49, 190, 69), wFilter, -1);
 	cbRace->addItem(dataManager.GetSysString(1310), 0);
-	for(int filter = 0x1; filter != 0x400000; filter <<= 1)
+	for(int filter = 0x1; filter != 0x1000000; filter <<= 1)
 		cbRace->addItem(dataManager.FormatRace(filter), filter);
 	env->addStaticText(dataManager.GetSysString(1322), rect<s32>(205, 28, 280, 48), false, false, wFilter);
 	ebAttack = env->addEditBox(L"", rect<s32>(260, 26, 340, 46), true, wFilter);
@@ -527,7 +528,7 @@ void Game::MainLoop() {
 	BuildProjectionMatrix(mProjection, -0.81f, 0.44f, -0.42f, 0.42f, 1.0f, 100.0f);
 	camera->setProjectionMatrix(mProjection);
 
-	mProjection.buildCameraLookAtMatrixLH(vector3df(3.95f, 8.0f, 7.8f), vector3df(3.95f, 0, 0), vector3df(0, 0, 1));
+	mProjection.buildCameraLookAtMatrixLH(vector3df(4.2f, 8.0f, 7.8f), vector3df(4.2f, 0, 0), vector3df(0, 0, 1));
 	camera->setViewMatrixAffector(mProjection);
 	smgr->setAmbientLight(SColorf(1.0f, 1.0f, 1.0f));
 	float atkframe = 0.1f;
@@ -690,6 +691,7 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
 		BufferIO::DecodeUTF8(dirp->d_name, wname);
 		cbDeck->addItem(wname);
 	}
+	closedir(dir);
 #endif
 	for(size_t i = 0; i < cbDeck->getItemCount(); ++i) {
 		if(!wcscmp(cbDeck->getItem(i), gameConf.lastdeck)) {
@@ -725,6 +727,7 @@ void Game::RefreshReplay() {
 		if(Replay::CheckReplay(wname))
 			lstReplayList->addItem(wname);
 	}
+	closedir(dir);
 #endif
 }
 void Game::RefreshSingleplay() {
@@ -752,6 +755,7 @@ void Game::RefreshSingleplay() {
 		BufferIO::DecodeUTF8(dirp->d_name, wname);
 		lstSinglePlayList->addItem(wname);
 	}
+	closedir(dir);
 #endif
 }
 void Game::LoadConfig() {
@@ -870,6 +874,11 @@ void Game::ShowCardInfo(int code) {
 			myswprintf(&formatBuffer[cd.level + 3], L"%d/?", cd.attack);
 		else
 			myswprintf(&formatBuffer[cd.level + 3], L"%d/%d", cd.attack, cd.defence);
+		if(cd.type & TYPE_PENDULUM) {
+			wchar_t scaleBuffer[16];
+			myswprintf(scaleBuffer, L"   %d/%d", cd.lscale, cd.rscale);
+			wcscat(formatBuffer, scaleBuffer);
+		}
 		stDataInfo->setText(formatBuffer);
 		stText->setRelativePosition(rect<s32>(15, 83, 287, 324));
 		scrCardText->setRelativePosition(rect<s32>(267, 83, 287, 324));

script/c10028593.lua

---݆h칷
+--輪廻天狗
 function c10028593.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)