Merge https://github.com/zh99998/ygopro

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/bufferio.h

@@ -82,7 +82,7 @@ public:
 		return str - pstr;
 	}
 	static int DecodeUTF8(const char * src, wchar_t * wstr) {
-		char* p = (char*)src;
+		const char* p = src;
 		wchar_t* wp = wstr;
 		while(*p != 0) {
 			if((*p & 0x80) == 0) {

gframe/client_card.h

@@ -11,7 +11,7 @@ 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;
@@ -22,7 +22,7 @@ struct CardData {
 struct CardDataC {
 	unsigned int code;
 	unsigned int alias;
-	unsigned int setcode;
+	unsigned long long setcode;
 	unsigned int type;
 	unsigned int level;
 	unsigned int attribute;

gframe/config.h

@@ -46,9 +46,14 @@ inline int _wtoi(const wchar_t * s) {
 }
 #endif
 
-#include <irrlicht.h>
+#include <irrlicht.h>
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/gl.h>
-#include <GL/glu.h>
+#include <GL/glu.h>
+#endif
 #include "CGUITTFont.h"
 #include "CGUIImageButton.h"
 #include <iostream>

gframe/data_manager.cpp

@@ -27,7 +27,7 @@ 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);
@@ -54,7 +54,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));
 		}

gframe/deck_con.cpp

@@ -214,9 +214,19 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			}
 			break;
 		}
+		case irr::gui::EGET_SCROLL_BAR_CHANGED: {
+			switch(id) {
+			case SCROLL_CARDTEXT: {
+				u32 pos = mainGame->scrCardText->getPos();
+				mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth()-25, mainGame->textFont, mainGame->showingtext, pos);
+				break;
+			}
+			break;
+			}
+		}
 		case irr::gui::EGET_EDITBOX_ENTER: {
 			switch(id) {
-			case SCROLL_KEYWORD: {
+			case EDITBOX_KEYWORD: {
 				irr::SEvent me;
 				me.EventType = irr::EET_GUI_EVENT;
 				me.GUIEvent.EventType = irr::gui::EGET_BUTTON_CLICKED;
@@ -639,8 +649,8 @@ void DeckBuilder::FilterCards() {
 		pstr = 0;
 	auto strpointer = dataManager._strings.begin();
 	for(code_pointer ptr = dataManager._datas.begin(); ptr != dataManager._datas.end(); ++ptr, ++strpointer) {
-		CardDataC& data = ptr->second;
-		CardString& text = strpointer->second;
+		const CardDataC& data = ptr->second;
+		const CardString& text = strpointer->second;
 		if(data.type & TYPE_TOKEN)
 			continue;
 		switch(filter_type) {

gframe/drawing.cpp

@@ -305,7 +305,7 @@ void Game::DrawMisc() {
 	else driver->draw2DImage(imageManager.tLPBar, recti(335, 12, 335 + 290 * dInfo.lp[0] / 8000, 28), recti(0, 0, 16, 16), 0, 0, true);
 	if(dInfo.lp[1] >= 8000)
 		driver->draw2DImage(imageManager.tLPBar, recti(696, 12, 986, 28), recti(0, 0, 16, 16), 0, 0, true);
-	else driver->draw2DImage(imageManager.tLPBar, recti(986 - 290 * dInfo.lp[1] / 8000, 12, 986 , 28), recti(0, 0, 16, 16), 0, 0, true);
+	else driver->draw2DImage(imageManager.tLPBar, recti(986 - 290 * dInfo.lp[1] / 8000, 12, 986, 28), recti(0, 0, 16, 16), 0, 0, true);
 	if(lpframe) {
 		dInfo.lp[lpplayer] -= lpd;
 		myswprintf(dInfo.strLP[lpplayer], L"%d", dInfo.lp[lpplayer]);
@@ -666,31 +666,22 @@ void Game::DrawSpec() {
 		if (attack_sv > 28)
 			attack_sv = 0;
 	}
-
-
-	bool showChat=true;
-	if(hideChat)
-	{
-	    showChat=false;
+	bool showChat = true;
+	if(hideChat) {
+	    showChat = false;
 	    hideChatTimer = 10;
-	}
-	else if (hideChatTimer > 0)
-	{
-	    showChat= false;
+	} else if(hideChatTimer > 0) {
+	    showChat = false;
 	    hideChatTimer--;
 	}
-	int maxChatLines = mainGame->dInfo.isStarted?5:8;
-
-	for(int i = 0; i < maxChatLines ; ++i) {
+	int maxChatLines = mainGame->dInfo.isStarted ? 5 : 8;
+	for(int i = 0; i < maxChatLines; ++i) {
 		static unsigned int chatColor[] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xff8080ff, 0xffff4040, 0xffff4040,
-						   0xffff4040,0xff40ff40,0xff4040ff,0xff40ffff,0xffff40ff,0xffffff40,0xffffffff,0xff808080,0xff404040};
-
+		                                   0xffff4040, 0xff40ff40, 0xff4040ff, 0xff40ffff, 0xffff40ff, 0xffffff40, 0xffffffff, 0xff808080, 0xff404040};
 		if(chatTiming[i]) {
 			chatTiming[i]--;
-
-			if(!showChat && i >2)
-                continue;
-
+			if(!showChat && i > 2)
+				continue;
 			int w = textFont->getDimension(chatMsg[i].c_str()).Width;
 			driver->draw2DRectangle(recti(305, 596 - 20 * i, 307 + w, 616 - 20 * i), 0xa0000000, 0xa0000000, 0xa0000000, 0xa0000000);
 			textFont->draw(chatMsg[i].c_str(), rect<s32>(305, 595 - 20 * i, 1020, 615 - 20 * i), 0xff000000, false, false);
@@ -797,7 +788,7 @@ void Game::DrawThumb(code_pointer cp, position2di pos, std::unordered_map<int, i
 	}
 }
 void Game::DrawDeckBd() {
-	wchar_t textBuffer[32];
+	wchar_t textBuffer[64];
 	//main deck
 	driver->draw2DRectangle(recti(310, 137, 410, 157), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
 	driver->draw2DRectangleOutline(recti(309, 136, 410, 157));

gframe/duelclient.cpp

@@ -548,68 +548,43 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 	}
 	case STOC_CHAT: {
 		STOC_Chat* pkt = (STOC_Chat*)pdata;
-		wchar_t msg[256];
-		if(pkt->player < 4) {
+		int player = pkt->player;
+		if(player < 4) {
 			if(mainGame->chkIgnore1->isChecked())
 				break;
-			BufferIO::CopyWStr(pkt->msg, msg, 256);
-			msg[(len - 3) / 2] = 0;
-			mainGame->gMutex.Lock();
 			if(!mainGame->dInfo.isTag) {
 				if(mainGame->dInfo.isStarted)
-					mainGame->AddChatMsg(msg, mainGame->LocalPlayer(pkt->player));
-				else
-					mainGame->AddChatMsg(msg, pkt->player);
+					player = mainGame->LocalPlayer(player);
 			} else {
-				if(mainGame->dInfo.isFirst || !mainGame->dInfo.isStarted) {
-					if(pkt->player == 0)
-						mainGame->AddChatMsg(msg, 0);
-					else if(pkt->player == 1)
-						mainGame->AddChatMsg(msg, 2);
-					else if(pkt->player == 2)
-						mainGame->AddChatMsg(msg, 1);
-					else if(pkt->player == 3)
-						mainGame->AddChatMsg(msg, 3);
-					else
-						mainGame->AddChatMsg(msg, 10);
-				} else {
-					if(pkt->player == 0)
-						mainGame->AddChatMsg(msg, 1);
-					else if(pkt->player == 1)
-						mainGame->AddChatMsg(msg, 3);
-					else if(pkt->player == 2)
-						mainGame->AddChatMsg(msg, 0);
-					else if(pkt->player == 3)
-						mainGame->AddChatMsg(msg, 2);
-					else
-						mainGame->AddChatMsg(msg, 10);
-				}
+				if(mainGame->dInfo.isStarted && !mainGame->dInfo.isFirst)
+					player ^= 2;
+				if(player == 0)
+					player = 0;
+				else if(player == 1)
+					player = 2;
+				else if(player == 2)
+					player = 1;
+				else if(player == 3)
+					player = 3;
+				else
+					player = 10;
 			}
-			mainGame->gMutex.Unlock();
-		} else if(pkt->player == 8) { //system custom message.
-			if(mainGame->chkIgnore1->isChecked())
-				break;
-			BufferIO::CopyWStr(pkt->msg, msg, 256);
-			msg[(len - 3) / 2] = 0;
-			mainGame->gMutex.Lock();
-			mainGame->AddChatMsg(msg, 8);
-			mainGame->gMutex.Unlock();
-		} else if(pkt->player >= 11 && pkt->player<=19) { //system custom message.
-                        BufferIO::CopyWStr(pkt->msg, msg, 256);
-                        msg[(len - 3) / 2] = 0;
-                        mainGame->gMutex.Lock();
-                        mainGame->AddChatMsg(msg, pkt->player);
-                        mainGame->gMutex.Unlock();
-
 		} else {
-			if(mainGame->chkIgnore2->isChecked())
-				break;
-			BufferIO::CopyWStr(pkt->msg, msg, 256);
-			msg[(len - 3) / 2] = 0;
-			mainGame->gMutex.Lock();
-			mainGame->AddChatMsg(msg, 10);
-			mainGame->gMutex.Unlock();
+			if(player == 8) { //system custom message.
+				if(mainGame->chkIgnore1->isChecked())
+					break;
+			} else if(player < 11 || player > 19) {
+				if(mainGame->chkIgnore2->isChecked())
+					break;
+				player = 10;
+			}
 		}
+		wchar_t msg[256];
+		BufferIO::CopyWStr(pkt->msg, msg, 256);
+		msg[(len - 3) / 2] = 0;
+		mainGame->gMutex.Lock();
+		mainGame->AddChatMsg(msg, player);
+		mainGame->gMutex.Unlock();
 		break;
 	}
 	case STOC_HS_PLAYER_ENTER: {
@@ -1666,8 +1641,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]);
@@ -1675,9 +1658,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);

gframe/event_handler.cpp

@@ -102,6 +102,10 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					DuelClient::StopClient();
 					mainGame->dInfo.isStarted = false;
 					mainGame->device->setEventReceiver(&mainGame->menuHandler);
+					mainGame->wCardImg->setVisible(false);
+					mainGame->wInfos->setVisible(false);
+					mainGame->wPhase->setVisible(false);
+					mainGame->btnLeaveGame->setVisible(false);
 					mainGame->btnCreateHost->setEnabled(true);
 					mainGame->btnJoinHost->setEnabled(true);
 					mainGame->btnJoinCancel->setEnabled(true);
@@ -726,6 +730,11 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				}
 				break;
 			}
+			case SCROLL_CARDTEXT: {
+				u32 pos = mainGame->scrCardText->getPos();
+				mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth()-25, mainGame->textFont, mainGame->showingtext, pos);
+				break;
+			}
 			break;
 			}
 		}
@@ -822,6 +831,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					mainGame->stInfo->setText(L"");
 					mainGame->stDataInfo->setText(L"");
 					mainGame->stText->setText(L"");
+					mainGame->scrCardText->setVisible(false);
 				}
 			}
 			break;
@@ -1304,8 +1314,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					if(hovered_card->location == LOCATION_HAND && !mainGame->dInfo.is_shuffling && mainGame->dInfo.curMsg != MSG_SHUFFLE_HAND) {
 						hovered_card->is_hovered = false;
 						MoveCard(hovered_card, 5);
-						if(hovered_controler== 0)
-                            mainGame->hideChat=false;
+						if(hovered_controler == 0)
+							mainGame->hideChat = false;
 					}
 					if(hovered_card->equipTarget)
 						hovered_card->equipTarget->is_showequip = false;
@@ -1325,8 +1335,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					if(hovered_location == LOCATION_HAND) {
 						mcard->is_hovered = true;
 						MoveCard(mcard, 5);
-						if(hovered_controler== 0)
-                            mainGame->hideChat=true;
+						if(hovered_controler == 0)
+							mainGame->hideChat = true;
 					}
 					if(mcard->equipTarget)
 						mcard->equipTarget->is_showequip = true;
@@ -1346,7 +1356,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 							if(mcard->type & TYPE_MONSTER) {
 								myswprintf(formatBuffer, L"%ls", dataManager.GetName(mcard->code));
 								str.append(formatBuffer);
-								if(mcard->alias && (mcard->alias < mcard->code - 10 || mcard->alias > mcard->code + 10)) {
+								if(mcard->alias && (mcard->alias < mcard->code - 10 || mcard->alias > mcard->code + 10)
+								        && wcscmp(dataManager.GetName(mcard->code), dataManager.GetName(mcard->alias))) {
 									myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias));
 									str.append(formatBuffer);
 								}
@@ -1420,6 +1431,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 						mainGame->stInfo->setText(L"");
 						mainGame->stDataInfo->setText(L"");
 						mainGame->stText->setText(L"");
+						mainGame->scrCardText->setVisible(false);
 					}
 				} else {
 					mainGame->stTip->setVisible(false);

gframe/game.cpp

@@ -14,7 +14,7 @@
 #include <dirent.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x1320;
+const unsigned short PRO_VERSION = 0x1321;
 
 namespace ygo {
 
@@ -48,6 +48,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;
@@ -66,7 +67,7 @@ bool Game::Initialize() {
 	device->setResizable(false);
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"YGOPro Version:%X.0%X.%X)", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"YGOPro Version:%X.0%X.%X", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
@@ -206,7 +207,11 @@ bool Game::Initialize() {
 	stInfo->setOverrideColor(SColor(255, 0, 0, 255));
 	stDataInfo = env->addStaticText(L"", rect<s32>(15, 60, 296, 83), false, true, tabInfo, -1, false);
 	stDataInfo->setOverrideColor(SColor(255, 0, 0, 255));
-	stText = env->addStaticText(L"", rect<s32>(15, 83, 296, 324), false, true, tabInfo, -1, false);
+	stText = env->addStaticText(L"", rect<s32>(15, 83, 287, 324), false, true, tabInfo, -1, false);
+	scrCardText = env->addScrollBar(false, rect<s32>(267, 83, 287, 324), tabInfo, SCROLL_CARDTEXT);
+	scrCardText->setLargeStep(1);
+	scrCardText->setSmallStep(1);
+	scrCardText->setVisible(false);
 	//log
 	irr::gui::IGUITab* tabLog =  wInfos->addTab(dataManager.GetSysString(1271));
 	lstLog = env->addListBox(rect<s32>(10, 10, 290, 290), tabLog, LISTBOX_LOG, false);
@@ -409,7 +414,7 @@ bool Game::Initialize() {
 	ebStar = env->addEditBox(L"", rect<s32>(60, 72, 140, 92), true, wFilter);
 	ebStar->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	env->addStaticText(dataManager.GetSysString(1325), rect<s32>(205, 74, 280, 94), false, false, wFilter);
-	ebCardName = env->addEditBox(L"", rect<s32>(260, 72, 390, 92), true, wFilter, SCROLL_KEYWORD);
+	ebCardName = env->addEditBox(L"", rect<s32>(260, 72, 390, 92), true, wFilter, EDITBOX_KEYWORD);
 	ebCardName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	btnEffectFilter = env->addButton(rect<s32>(345, 28, 390, 69), wFilter, BUTTON_EFFECT_FILTER, dataManager.GetSysString(1326));
 	btnStartFilter = env->addButton(rect<s32>(210, 96, 390, 118), wFilter, BUTTON_START_FILTER, dataManager.GetSysString(1327));
@@ -484,8 +489,8 @@ bool Game::Initialize() {
 		col.setAlpha(224);
 		env->getSkin()->setColor((EGUI_DEFAULT_COLOR)i, col);
 	}
-	hideChat=false;
-	hideChatTimer=0;
+	hideChat = false;
+	hideChatTimer = 0;
 	return true;
 }
 void Game::MainLoop() {
@@ -545,6 +550,8 @@ void Game::MainLoop() {
 		driver->endScene();
 		if(closeSignal.Wait(0))
 			CloseDuelWindow();
+		if(!device->isWindowActive())
+			ignore_chain = false;
 		fps++;
 		cur_time = timer->getTime();
 		if(cur_time < fps * 17 - 20)
@@ -586,16 +593,38 @@ void Game::BuildProjectionMatrix(irr::core::matrix4& mProjection, f32 left, f32
 	mProjection[11] = 1.0f;
 	mProjection[14] = znear * zfar / (znear - zfar);
 }
-void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gui::CGUITTFont* font, wchar_t* text) {
+void Game::InitStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, u32 cHeight, irr::gui::CGUITTFont* font, const wchar_t* text) {
+	SetStaticText(pControl, cWidth, font, text);
+	if(font->getDimension(dataManager.strBuffer).Height <= cHeight) {
+		scrCardText->setVisible(false);
+		return;
+	}
+	SetStaticText(pControl, cWidth-25, font, text);
+	u32 fontheight = font->getDimension(L"A").Height + font->getKerningHeight();
+	u32 step = (font->getDimension(dataManager.strBuffer).Height - cHeight) / fontheight + 1;
+	scrCardText->setVisible(true);
+	scrCardText->setMin(0);
+	scrCardText->setMax(step);
+	scrCardText->setPos(0);
+}
+void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gui::CGUITTFont* font, const wchar_t* text, u32 pos) {
 	int pbuffer = 0;
-	unsigned int _width = 0, w = 0;
+	u32 _width = 0, _height = 0;
 	for(int i = 0; text[i] != 0 && i < 1023; ++i) {
-		w = font->getCharDimension(text[i]).Width;
-		if(text[i] == L'\n')
+		u32 w = font->getCharDimension(text[i]).Width;
+		if(text[i] == L'\n') {
+			dataManager.strBuffer[pbuffer++] = L'\n';
 			_width = 0;
-		else if(_width > 0 && _width + w > cWidth) {
+			_height++;
+			if(_height == pos)
+				pbuffer = 0;
+			continue;
+		} else if(_width > 0 && _width + w > cWidth) {
 			dataManager.strBuffer[pbuffer++] = L'\n';
 			_width = 0;
+			_height++;
+			if(_height == pos)
+				pbuffer = 0;
 		}
 		_width += w;
 		dataManager.strBuffer[pbuffer++] = text[i];
@@ -634,6 +663,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)) {
@@ -669,6 +699,7 @@ void Game::RefreshReplay() {
 		if(Replay::CheckReplay(wname))
 			lstReplayList->addItem(wname);
 	}
+	closedir(dir);
 #endif
 }
 void Game::RefreshSingleplay() {
@@ -696,6 +727,7 @@ void Game::RefreshSingleplay() {
 		BufferIO::DecodeUTF8(dirp->d_name, wname);
 		lstSinglePlayList->addItem(wname);
 	}
+	closedir(dir);
 #endif
 }
 void Game::LoadConfig() {
@@ -815,14 +847,18 @@ void Game::ShowCardInfo(int code) {
 		else
 			myswprintf(&formatBuffer[cd.level + 3], L"%d/%d", cd.attack, cd.defence);
 		stDataInfo->setText(formatBuffer);
-		stText->setRelativePosition(irr::core::position2di(15, 83));
+		stText->setRelativePosition(rect<s32>(15, 83, 287, 324));
+		scrCardText->setRelativePosition(rect<s32>(267, 83, 287, 324));
 	} else {
 		myswprintf(formatBuffer, L"[%ls]", dataManager.FormatType(cd.type));
 		stInfo->setText(formatBuffer);
 		stDataInfo->setText(L"");
-		stText->setRelativePosition(irr::core::position2di(15, 60));
+		stText->setRelativePosition(rect<s32>(15, 60, 287, 324));
+		scrCardText->setRelativePosition(rect<s32>(267, 60, 287, 324));
 	}
-	SetStaticText(stText, 270, textFont, (wchar_t*)dataManager.GetText(code));
+	showingtext = dataManager.GetText(code);
+	const auto& tsize = stText->getRelativePosition();
+	InitStaticText(stText, tsize.getWidth(), tsize.getHeight(), textFont, showingtext);
 }
 void Game::AddChatMsg(wchar_t* msg, int player) {
 	for(int i = 7; i > 0; --i) {
@@ -833,7 +869,7 @@ void Game::AddChatMsg(wchar_t* msg, int player) {
 	chatMsg[0].clear();
 	chatTiming[0] = 1200;
 	chatType[0] = player;
-	if (player<11 || player > 19) switch(player) {
+	switch(player) {
 	case 0: //from host
 		chatMsg[0].append(dInfo.hostname);
 		chatMsg[0].append(L": ");
@@ -861,7 +897,8 @@ void Game::AddChatMsg(wchar_t* msg, int player) {
 		chatMsg[0].append(L"[Script error:] ");
 		break;
 	default: //from watcher or unknown
-		chatMsg[0].append(L"[---]: ");
+		if(player < 11 || player > 19)
+			chatMsg[0].append(L"[---]: ");
 	}
 	chatMsg[0].append(msg);
 }

gframe/game.h

@@ -69,7 +69,8 @@ public:
 	bool Initialize();
 	void MainLoop();
 	void BuildProjectionMatrix(irr::core::matrix4& mProjection, f32 left, f32 right, f32 bottom, f32 top, f32 znear, f32 zfar);
-	void SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gui::CGUITTFont* font, wchar_t* text);
+	void InitStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, u32 cHeight, irr::gui::CGUITTFont* font, const wchar_t* text);
+	void SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gui::CGUITTFont* font, const wchar_t* text, u32 pos = 0);
 	void RefreshDeck(irr::gui::IGUIComboBox* cbDeck);
 	void RefreshReplay();
 	void RefreshSingleplay();
@@ -119,6 +120,7 @@ public:
 	int waitFrame;
 	int signalFrame;
 	int actionParam;
+	const wchar_t* showingtext;
 	int showcard;
 	int showcardcode;
 	int showcarddif;
@@ -166,6 +168,7 @@ public:
 	irr::gui::IGUIStaticText* stInfo;
 	irr::gui::IGUIStaticText* stDataInfo;
 	irr::gui::IGUIStaticText* stText;
+	irr::gui::IGUIScrollBar *scrCardText;
 	irr::gui::IGUICheckBox* chkAutoPos;
 	irr::gui::IGUICheckBox* chkRandomPos;
 	irr::gui::IGUICheckBox* chkAutoChain;
@@ -436,6 +439,7 @@ extern Game* mainGame;
 #define BUTTON_LEAVE_GAME			263
 #define BUTTON_CLEAR_LOG			270
 #define LISTBOX_LOG					271
+#define SCROLL_CARDTEXT				280
 #define BUTTON_CATEGORY_OK			300
 #define COMBOBOX_DBLFLIST			301
 #define COMBOBOX_DBDECKS			302
@@ -450,7 +454,7 @@ extern Game* mainGame;
 #define BUTTON_EFFECT_FILTER		311
 #define BUTTON_START_FILTER			312
 #define SCROLL_FILTER				314
-#define SCROLL_KEYWORD				315
+#define EDITBOX_KEYWORD				315
 #define BUTTON_REPLAY_START			320
 #define BUTTON_REPLAY_PAUSE			321
 #define BUTTON_REPLAY_STEP			322

gframe/single_mode.cpp

@@ -63,6 +63,7 @@ int SingleMode::SinglePlayThread(void* param) {
 	mainGame->stInfo->setText(L"");
 	mainGame->stDataInfo->setText(L"");
 	mainGame->stText->setText(L"");
+	mainGame->scrCardText->setVisible(false);
 	mainGame->wPhase->setVisible(true);
 	mainGame->dField.panel = 0;
 	mainGame->dField.hovered_card = 0;

ocgcore/card.h

@@ -21,7 +21,7 @@ class group;
 struct card_data {
 	uint32 code;
 	uint32 alias;
-	uint32 setcode;
+	uint64 setcode;
 	uint32 type;
 	uint32 level;
 	uint32 attribute;
@@ -132,6 +132,7 @@ public:
 	uint32 get_infos(byte* buf, int32 query_flag, int32 use_cache = TRUE);
 	uint32 get_info_location();
 	uint32 get_code();
+	uint32 get_another_code();
 	int32 is_set_card(uint32 set_code);
 	uint32 get_type();
 	int32 get_base_attack(uint8 swap = FALSE);
@@ -234,7 +235,7 @@ public:
 	int32 is_control_can_be_changed();
 	int32 is_capable_be_battle_target(card* pcard);
 	int32 is_capable_be_effect_target(effect* peffect, uint8 playerid);
-	int32 is_can_be_fusion_material();
+	int32 is_can_be_fusion_material(uint8 ignore_mon = FALSE);
 	int32 is_can_be_synchro_material(card* scard, card* tuner = 0);
 	int32 is_can_be_xyz_material(card* scard);
 };

ocgcore/interpreter.cpp

@@ -89,6 +89,7 @@ static const struct luaL_Reg cardlib[] = {
 	{ "GetUnionCount", scriptlib::card_get_union_count },
 	{ "GetOverlayGroup", scriptlib::card_get_overlay_group },
 	{ "GetOverlayCount", scriptlib::card_get_overlay_count },
+	{ "GetOverlayTarget", scriptlib::card_get_overlay_target },
 	{ "CheckRemoveOverlayCard", scriptlib::card_check_remove_overlay_card },
 	{ "RemoveOverlayCard", scriptlib::card_remove_overlay_card },
 	{ "GetAttackedGroup", scriptlib::card_get_attacked_group },

ocgcore/scriptlib.h

@@ -91,6 +91,7 @@ public:
 	static int32 card_get_union_count(lua_State *L);
 	static int32 card_get_overlay_group(lua_State *L);
 	static int32 card_get_overlay_count(lua_State *L);
+	static int32 card_get_overlay_target(lua_State *L);
 	static int32 card_check_remove_overlay_card(lua_State *L);
 	static int32 card_remove_overlay_card(lua_State *L);
 	static int32 card_get_attacked_group(lua_State *L);

script/c10028593.lua

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