Merge remote-tracking branch 'Fluorohydride/master'

CMakeLists.txt

+project (ygo)
+
+cmake_minimum_required (VERSION 2.8)
+
+if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS "Setting build type to 'Debug' as none was specified.")
+    set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+endif()
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/macros")
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+include (AutoFiles)
+
+include (platform/settings)
+
+if (MSVC)
+    add_subdirectory (event)
+    add_subdirectory (freetype)
+    add_subdirectory (irrlicht)
+    add_subdirectory (sqlite3)
+else ()
+    find_package(LibEvent REQUIRED)
+    find_package(Freetype REQUIRED)
+    find_package(Irrlicht REQUIRED)
+    find_package(Sqlite REQUIRED)
+    find_package(OpenGL REQUIRED)
+endif ()
+
+option(USE_IRRKLANG "Use irrKlang sound library" OFF)
+if (USE_IRRKLANG)
+    set(IRRKLANG_DIR ${CMAKE_SOURCE_DIR}/irrKlang)
+endif ()
+
+add_subdirectory (lua)
+add_subdirectory (ocgcore)
+add_subdirectory (gframe)

cmake/compiler/clang-compile.cmake

+include (compiler/gcc)

cmake/compiler/gcc.cmake

+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+add_definitions ( "-fexceptions" "-fomit-frame-pointer" "-fno-strict-aliasing" "-Wno-format-security" )

cmake/compiler/icc.cmake

+

cmake/compiler/mingw.cmake

+add_definitions ( "-static-libgcc" "-static-libstdc++" )

cmake/compiler/msvc.cmake

+add_definitions ( "-wd4996" "-D_CRT_SECURE_NO_WARNINGS" "-D_ITERATOR_DEBUG_LEVEL=0" )
+add_definitions ( "-D_UNICODE" "-DUNICODE" "/utf-8" )
+
+include (MSVCMultipleProcessCompile)
+include (MSVCStaticRuntime)

cmake/macros/AutoFiles.cmake

+function (AutoFiles _folder _base _pattern)
+    if (ARGC GREATER 3)
+        set(_exclude ${ARGN})
+    else ()
+        set(_exclude)
+    endif ()
+    file (GLOB _files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${_folder}/*)
+    set (folderFiles)
+    foreach (_fname ${_files})
+        if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_fname})
+            AutoFiles ("${_fname}" "${_base}" "${_pattern}" "${_exclude}")
+        elseif (_fname MATCHES ${_pattern})
+            if(_exclude)
+                if (NOT _fname MATCHES ${_exclude})
+                    set(folderFiles ${folderFiles} ${_fname})
+                endif ()
+            else ()
+                set(folderFiles ${folderFiles} ${_fname})
+            endif ()
+        endif ()
+    endforeach ()
+
+    string(REPLACE "./" "" _folder2 ${_folder})
+    string(REPLACE "/" "\\" _folder2 ${_folder2})
+    if (_folder2 STREQUAL ".")
+        source_group(${_base} FILES ${folderFiles})
+    else ()
+        source_group(${_base}\\${_folder2} FILES ${folderFiles})
+    endif ()
+
+    set(AUTO_FILES_RESULT ${AUTO_FILES_RESULT} ${folderFiles} PARENT_SCOPE)
+endfunction ()

cmake/macros/FindDL.cmake

+# - Try to find the dl library
+# Once done this will define
+#
+#  DL_FOUND - System has libdl
+#  DL_LIBRARIES - The libraries needed to use libdl
+#  DL_DEFINITIONS - Compiler switches required for using libdl
+
+FIND_PATH(DL_INCLUDE_DIR dlfcn.h
+   PATH_SUFFIXES include
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+FIND_LIBRARY(DL_LIBRARIES NAMES dl
+   PATH_SUFFIXES lib64 lib
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(libdl DEFAULT_MSG DL_LIBRARIES DL_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(DL_INCLUDE_DIR DL_LIBRARIES)

cmake/macros/FindFreetype.cmake

+# - Try to find the Lib library
+# Once done this will define
+#
+#  FREETYPE_FOUND - System has freetype
+#  FREETYPE_INCLUDE_DIR - The freetype include directory
+#  FREETYPE_LIBRARIES - The libraries needed to use freetype
+#  FREETYPE_DEFINITIONS - Compiler switches required for using freetype
+
+SET(FREETYPE_DEFINITIONS ${PC_FREETYPE_CFLAGS_OTHER})
+
+FIND_PATH(FREETYPE_INCLUDE_DIR ft2build.h
+   HINTS
+   ${PC_FREETYPE_INCLUDEDIR}
+   ${PC_FREETYPE_INCLUDE_DIRS}
+   PATH_SUFFIXES freetype2
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+FIND_LIBRARY(FREETYPE_LIBRARIES NAMES freetype
+   HINTS
+   ${PC_FREETYPE_LIBDIR}
+   ${PC_FREETYPE_LIBRARY_DIRS}
+   PATH_SUFFIXES lib64 lib
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+SET(FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES})
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREETYPE DEFAULT_MSG FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(FREETYPE_INCLUDE_DIR FREETYPE_LIBRARIES)

cmake/macros/FindIrrlicht.cmake

+# - Try to find the Lib library
+# Once done this will define
+#
+#  IRRLICHT_FOUND - System has IRRLICHT
+#  IRRLICHT_INCLUDE_DIR - The IRRLICHT include directory
+#  IRRLICHT_LIBRARIES - The libraries needed to use IRRLICHT
+#  IRRLICHT_DEFINITIONS - Compiler switches required for using IRRLICHT
+
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+#FIND_PACKAGE(PkgConfig)
+#PKG_SEARCH_MODULE(PC_IRRLICHT Irrlicht)
+
+SET(IRRLICHT_DEFINITIONS ${PC_IRRLICHT_CFLAGS_OTHER})
+
+FIND_PATH(IRRLICHT_INCLUDE_DIR irrlicht.h
+   HINTS
+   ${PC_IRRLICHT_INCLUDEDIR}
+   ${PC_IRRLICHT_INCLUDE_DIRS}
+   PATH_SUFFIXES include include/irrlicht
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+FIND_LIBRARY(IRRLICHT_LIBRARIES NAMES Irrlicht irrlicht
+   HINTS
+   ${PC_IRRLICHT_LIBDIR}
+   ${PC_IRRLICHT_LIBRARY_DIRS}
+   PATH_SUFFIXES lib64 lib
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Irrlicht DEFAULT_MSG IRRLICHT_LIBRARIES IRRLICHT_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(IRRLICHT_INCLUDE_DIR IRRLICHT_LIBRARIES)

cmake/macros/FindLibEvent.cmake

+# - Try to find the Lib library
+# Once done this will define
+#
+#  LIBEVENT_FOUND - System has Libevent
+#  LIBEVENT_INCLUDE_DIR - The Libevent include directory
+#  LIBEVENT_LIBRARIES - The libraries needed to use Libevent
+#  LIBEVENT_DEFINITIONS - Compiler switches required for using Libevent
+
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+#FIND_PACKAGE(PkgConfig)
+#PKG_SEARCH_MODULE(PC_LIBEVENT event)
+
+SET(LIBEVENT_DEFINITIONS ${PC_LIBEVENT_CFLAGS_OTHER})
+
+FIND_PATH(LIBEVENT_INCLUDE_DIR event2/event.h
+   HINTS
+   ${PC_LIBEVENT_INCLUDEDIR}
+   ${PC_LIBEVENT_INCLUDE_DIRS}
+   PATH_SUFFIXES include
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+FIND_LIBRARY(LIBEVENT_LIBRARIES NAMES event
+   HINTS
+   ${PC_LIBEVENT_LIBDIR}
+   ${PC_LIBEVENT_LIBRARY_DIRS}
+   PATH_SUFFIXES lib64 lib
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+FIND_LIBRARY(LIBEVENT_LIBRARIES_PTHREADS NAMES event_pthreads
+   HINTS
+   ${PC_LIBEVENT_LIBDIR}
+   ${PC_LIBEVENT_LIBRARY_DIRS}
+   PATH_SUFFIXES lib64 lib
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+SET(LIBEVENT_LIBRARIES ${LIBEVENT_LIBRARIES} ${LIBEVENT_LIBRARIES_PTHREADS})
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEvent DEFAULT_MSG LIBEVENT_LIBRARIES LIBEVENT_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(LIBEVENT_INCLUDE_DIR LIBEVENT_LIBRARIES)

cmake/macros/FindSqlite.cmake

+# - Try to find the Lib library
+# Once done this will define
+#
+#  SQLITE_FOUND - System has sqlite
+#  SQLITE_INCLUDE_DIR - The sqlite include directory
+#  SQLITE_LIBRARIES - The libraries needed to use sqlite
+#  SQLITE_DEFINITIONS - Compiler switches required for using sqlite
+
+SET(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER})
+
+FIND_PATH(SQLITE_INCLUDE_DIR sqlite3.h
+   HINTS
+   ${PC_SQLITE_INCLUDEDIR}
+   ${PC_SQLITE_INCLUDE_DIRS}
+   PATH_SUFFIXES include
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+FIND_LIBRARY(SQLITE_LIBRARIES NAMES sqlite3
+   HINTS
+   ${PC_SQLITE_LIBDIR}
+   ${PC_SQLITE_LIBRARY_DIRS}
+   PATH_SUFFIXES lib64 lib
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /opt/local
+)
+
+SET(SQLITE_LIBRARIES ${SQLITE_LIBRARIES})
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLITE DEFAULT_MSG SQLITE_LIBRARIES SQLITE_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES)

cmake/macros/ListCombinations.cmake

+# - Combine lists of prefixes and suffixes in all combinations
+#
+#  list_combinations(var PREFIXES listitems... SUFFIXES listitems...) -
+#   where var is the name of your desired output variable and PREFIXES
+#   and SUFFIXES are special arguments that indicate the start of your
+#   list of prefixes or suffixes respectively.
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__list_combinations)
+	return()
+endif()
+set(__list_combinations YES)
+
+function(list_combinations var)
+	# Parse arguments
+	set(_prefixes)
+	set(_suffixes)
+	set(_nowhere)
+	set(_curdest _nowhere)
+	foreach(_element ${ARGN})
+		if("${_element}" STREQUAL "PREFIXES")
+			set(_curdest _prefixes)
+		elseif("${_element}" STREQUAL "SUFFIXES")
+			set(_curdest _suffixes)
+		else()
+			list(APPEND ${_curdest} "${_element}")
+		endif()
+	endforeach()
+	if(_nowhere)
+		message(STATUS "_prefixes ${_prefixes}")
+		message(STATUS "_prefixes ${_suffixes}")
+		message(STATUS "_prefixes ${_nowhere}")
+		message(FATAL_ERROR
+			"Syntax error in use of ${CMAKE_CURRENT_LIST_FILE}")
+	endif()
+
+	foreach(_prefix ${_prefixes})
+		foreach(_suffix ${_suffixes})
+			list(APPEND _out "${_prefix}${_suffix}")
+		endforeach()
+	endforeach()
+
+	set(${var} "${_out}" PARENT_SCOPE)
+endfunction()

cmake/macros/MSVCMultipleProcessCompile.cmake

+# - Compile with multiple processes on MSVC
+#
+#  include(MSVCMultipleProcessCompile)
+#
+# Requires these CMake modules:
+#  ListCombinations.cmake
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(MSVC AND NOT "${MSVC_VERSION}" LESS 1400)
+	# Only available in VS 2005 and newer
+	string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" _conftypesUC)
+	include(ListCombinations)
+	list_combinations(_varnames
+		PREFIXES
+		CMAKE_C_FLAGS_
+		CMAKE_CXX_FLAGS_
+		SUFFIXES
+		${_conftypesUC})
+	foreach(_var ${_varnames})
+		set(${_var} "${${_var}} /MP")
+	endforeach()
+endif()

cmake/macros/MSVCStaticRuntime.cmake

+# - Modify compile flags to use the static runtimes of MSVC
+#
+#  include(MSVCStaticRuntime)
+#
+# Requires these CMake modules:
+#  ListCombinations.cmake
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(MSVC)
+	string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" _conftypesUC)
+	include(ListCombinations)
+	list_combinations(_varnames
+		PREFIXES
+		CMAKE_C_FLAGS_
+		CMAKE_CXX_FLAGS_
+		SUFFIXES
+		${_conftypesUC})
+	foreach(_var ${_varnames})
+		string(REPLACE "/MDd" "/MTd" ${_var} "${${_var}}")
+		string(REPLACE "/MD" "/MT" ${_var} "${${_var}}")
+	endforeach()
+endif()
+
+set(Boost_USE_STATIC_LIBS ON)

cmake/platform/apple.cmake

+add_definitions ( "-DLUA_USE_MACOSX" )

cmake/platform/common.cmake

+add_definitions ( "-DLUA_USE_POSIX" )

cmake/platform/linux.cmake

+add_definitions ( "-DLUA_USE_LINUX" )

cmake/platform/settings.cmake

+if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+    set(PLATFORM 64)
+    MESSAGE(STATUS "Detected 64-bit platform")
+else()
+    set(PLATFORM 32)
+    MESSAGE(STATUS "Detected 32-bit platform")
+endif()
+
+if(WIN32)
+  include(platform/win)
+elseif(UNIX)
+  include(platform/unix)
+endif()

cmake/platform/unix.cmake

+if (APPLE)
+  include (platform/apple)
+  if ("${CMAKE_GENERATOR}" MATCHES "Xcode")
+    include (platform/xcode)
+  endif ()
+elseif (CMAKE_SYSTEM MATCHES Linux)
+  include (platform/linux)
+else ()
+  include (platform/common)
+endif ()
+
+if(CMAKE_C_COMPILER MATCHES "icc")
+  include(compiler/icc)
+elseif(CMAKE_C_COMPILER MATCHES "clang")
+  include(compiler/clang-compile)
+elseif(CMAKE_C_COMPILER MATCHES "cc")
+  include(compiler/gcc)
+endif()
+
+find_package(Threads)
+find_package(DL)

cmake/platform/win.cmake

+if ( MSVC )
+  include(compiler/msvc)
+elseif ( MINGW )
+  if(CMAKE_C_COMPILER MATCHES "clang")
+    include(compiler/clang)
+  elseif(CMAKE_C_COMPILER MATCHES "cc")
+    include(compiler/gcc)
+  endif()
+  include(compiler/mingw)
+endif()

cmake/platform/xcode.cmake

+set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")

gframe/CMakeLists.txt

+project (ygopro)
+
+if (NOT WIN32 AND NOT APPLE)
+    include (FindX11)   
+endif ()
+
+add_subdirectory (lzma)
+
+set (AUTO_FILES_RESULT)
+if (MSVC)
+    AutoFiles("." "res" "\\.(rc)$")
+    AutoFiles("." "src" "\\.(cpp|c|h)$" "CGUIButton.cpp|lzma/\\.*")
+else ()
+    AutoFiles("." "src" "\\.(cpp|c|h)$" "lzma/\\.*")
+endif ()
+
+if (MSVC)
+    add_executable (ygopro WIN32 ${AUTO_FILES_RESULT})
+    set_target_properties (ygopro PROPERTIES LINK_FLAGS /ENTRY:"mainCRTStartup")
+else ()
+    add_executable (ygopro ${AUTO_FILES_RESULT})
+endif ()
+
+target_link_libraries (ygopro ocgcore lua clzma)
+
+if (MSVC)
+    target_link_libraries (ygopro irrlicht freetype sqlite3 event)
+    include_directories ( "../irrlicht/include" "../freetype/include" "../event/include" "../sqlite3" )
+else ()
+    target_link_libraries (ygopro
+        ${IRRLICHT_LIBRARIES}
+        ${FREETYPE_LIBRARIES}
+        ${SQLITE_LIBRARIES}
+        ${LIBEVENT_LIBRARIES}
+        ${OPENGL_gl_LIBRARY}
+    )
+    include_directories (
+        ${IRRLICHT_INCLUDE_DIR}
+        ${FREETYPE_INCLUDE_DIR}
+        ${SQLITE_INCLUDE_DIRS}
+        ${LIBEVENT_INCLUDE_DIR}
+        ${OPENGL_INCLUDE_DIR}
+    )
+    target_link_libraries (ygopro ${CMAKE_THREAD_LIBS_INIT} ${DL_LIBRARIES})
+endif ()
+
+if (USE_IRRKLANG)
+    add_definitions ( "-DYGOPRO_USE_IRRKLANG" )
+    if (MSVC)
+        target_link_libraries (ygopro ${IRRKLANG_DIR}/lib/Win32-visualStudio/irrKlang.lib)
+	elseif (CMAKE_SYSTEM MATCHES Linux)
+	    target_link_libraries (ygopro ${IRRKLANG_DIR}/bin/linux-gcc-64/libIrrKlang.so)
+	endif ()
+	include_directories ( "${IRRKLANG_DIR}/include" )
+endif ()
+
+if (WIN32)
+    target_link_libraries (ygopro ws2_32 winmm gdi32 kernel32 user32 imm32 opengl32)
+endif ()

gframe/client_field.h

@@ -139,6 +139,7 @@ public:
 	void UpdateChainButtons();
 	void ShowCancelOrFinishButton(int buttonOp);
 	void SetShowMark(ClientCard* pcard, bool enable);
+	void ShowCardInfoInList(ClientCard* pcard, irr::gui::IGUIElement* element, irr::gui::IGUIElement* parent);
 	void SetResponseSelectedCards() const;
 	void SetResponseSelectedOption() const;
 	void CancelOrFinish();

gframe/deck_con.cpp

@@ -61,7 +61,7 @@ static bool check_set_code(const CardDataC& data, int set_code) {
 void DeckBuilder::Initialize() {
 	mainGame->is_building = true;
 	mainGame->is_siding = false;
-	mainGame->ShowCardNoInfo();
+	mainGame->ClearCardInfo();
 	mainGame->wInfos->setVisible(true);
 	mainGame->wCardImg->setVisible(true);
 	mainGame->wDeckEdit->setVisible(true);
@@ -88,7 +88,7 @@ void DeckBuilder::Initialize() {
 }
 void DeckBuilder::Terminate() {
 	mainGame->is_building = false;
-	mainGame->ShowCardNoInfo();
+	mainGame->ClearCardInfo();
 	mainGame->wDeckEdit->setVisible(false);
 	mainGame->wCategories->setVisible(false);
 	mainGame->wFilter->setVisible(false);
@@ -220,7 +220,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					mainGame->env->addMessageBox(L"", dataManager.GetSysString(1410));
 					break;
 				}
-				mainGame->ShowCardNoInfo();
+				mainGame->ClearCardInfo();
 				char deckbuf[1024];
 				char* pdeck = deckbuf;
 				BufferIO::WriteInt32(pdeck, deckManager.current_deck.main.size() + deckManager.current_deck.extra.size());

gframe/deck_manager.cpp

@@ -8,47 +8,11 @@ namespace ygo {
 
 DeckManager deckManager;
 
-void DeckManager::LoadLFList() {
+void DeckManager::LoadLFListSingle(const char* path) {
 	LFList* cur = NULL;
-	FILE* fp = fopen("lflist.conf", "r");
-	FILE* fp_custom = fopen("expansions/lflist.conf", "r");
+	FILE* fp = fopen(path, "r");
 	char linebuf[256];
 	wchar_t strBuffer[256];
-	if(fp_custom) {
-		while(fgets(linebuf, 256, fp_custom)) {
-			if(linebuf[0] == '#')
-				continue;
-			int p = 0, sa = 0, code, count;
-			if(linebuf[0] == '!') {
-				sa = BufferIO::DecodeUTF8((const char*)(&linebuf[1]), strBuffer);
-				while(strBuffer[sa - 1] == L'\r' || strBuffer[sa - 1] == L'\n' ) sa--;
-				LFList newlist;
-				_lfList.push_back(newlist);
-				cur = &_lfList[_lfList.size() - 1];
-				memcpy(cur->listName, (const void*)strBuffer, 40);
-				cur->listName[sa] = 0;
-				cur->content = new std::unordered_map<int, int>;
-				cur->hash = 0x7dfcee6a;
-				continue;
-			}
-			while(linebuf[p] != ' ' && linebuf[p] != '\t' && linebuf[p] != 0) p++;
-			if(linebuf[p] == 0)
-				continue;
-			linebuf[p++] = 0;
-			sa = p;
-			code = atoi(linebuf);
-			if(code == 0)
-				continue;
-			while(linebuf[p] == ' ' || linebuf[p] == '\t') p++;
-			while(linebuf[p] != ' ' && linebuf[p] != '\t' && linebuf[p] != 0) p++;
-			linebuf[p] = 0;
-			count = atoi(&linebuf[sa]);
-			if(cur == NULL) continue;
-			(*cur->content)[code] = count;
-			cur->hash = cur->hash ^ ((code << 18) | (code >> 14)) ^ ((code << (27 + count)) | (code >> (5 - count)));
-		}
-		fclose(fp_custom);
-	}
 	if(fp) {
 		while(fgets(linebuf, 256, fp)) {
 			if(linebuf[0] == '#')
@@ -84,6 +48,10 @@ void DeckManager::LoadLFList() {
 		}
 		fclose(fp);
 	}
+}
+void DeckManager::LoadLFList() {
+	LoadLFListSingle("expansions/lflist.conf");
+	LoadLFListSingle("lflist.conf");
 	LFList nolimit;
 	myswprintf(nolimit.listName, L"N/A");
 	nolimit.hash = 0;

gframe/deck_manager.h

@@ -36,6 +36,7 @@ public:
 	Deck pre_deck;
 	std::vector<LFList> _lfList;
 
+	void LoadLFListSingle(const char* path);
 	void LoadLFList();
 	wchar_t* GetLFListName(int lfhash);
 	int CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tcg, bool doubled, int forbiddentypes = 0);

gframe/duelclient.cpp

@@ -2966,7 +2966,17 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		mainGame->showcarddif = 0;
 		mainGame->showcard = 1;
 		pcard->is_highlighting = true;
-		mainGame->WaitFrameSignal(30);
+		if(pcard->location & 0x30) {
+			float shift = -0.15f;
+			if(cc == 1) shift = 0.15f;
+			pcard->dPos = irr::core::vector3df(shift, 0, 0);
+			pcard->dRot = irr::core::vector3df(0, 0, 0);
+			pcard->is_moving = true;
+			pcard->aniFrame = 5;
+			mainGame->WaitFrameSignal(30);
+			mainGame->dField.MoveCard(pcard, 5);
+		} else
+			mainGame->WaitFrameSignal(30);
 		pcard->is_highlighting = false;
 		mainGame->dField.current_chain.chain_card = pcard;
 		mainGame->dField.current_chain.code = code;
@@ -3096,6 +3106,15 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 					mainGame->dField.FadeCard(pcard, 255, 5);
 					mainGame->WaitFrameSignal(5);
 				}
+			} else if(pcard->location & 0x30) {
+				float shift = -0.15f;
+				if(c == 1) shift = 0.15f;
+				pcard->dPos = irr::core::vector3df(shift, 0, 0);
+				pcard->dRot = irr::core::vector3df(0, 0, 0);
+				pcard->is_moving = true;
+				pcard->aniFrame = 5;
+				mainGame->WaitFrameSignal(30);
+				mainGame->dField.MoveCard(pcard, 5);
 			} else
 				mainGame->WaitFrameSignal(30);
 			myswprintf(textBuffer, dataManager.GetSysString(1610), dataManager.GetName(pcard->code), dataManager.FormatLocation(l, s), s + 1);

gframe/event_handler.cpp

@@ -955,21 +955,46 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			if(id >= BUTTON_CARD_0 && id <= BUTTON_CARD_4) {
 				int pos = mainGame->scrCardList->getPos() / 10;
 				ClientCard* mcard = selectable_cards[id - BUTTON_CARD_0 + pos];
+				SetShowMark(mcard, true);
+				ShowCardInfoInList(mcard, mainGame->btnCardSelect[id - BUTTON_CARD_0], mainGame->wCardSelect);
 				if(mcard->code) {
 					mainGame->ShowCardInfo(mcard->code);
 				} else {
-					mainGame->ShowCardNoInfo(mcard->controler);
+					mainGame->ClearCardInfo(mcard->controler);
 				}
 			}
 			if(id >= BUTTON_DISPLAY_0 && id <= BUTTON_DISPLAY_4) {
 				int pos = mainGame->scrDisplayList->getPos() / 10;
 				ClientCard* mcard = display_cards[id - BUTTON_DISPLAY_0 + pos];
+				SetShowMark(mcard, true);
+				ShowCardInfoInList(mcard, mainGame->btnCardDisplay[id - BUTTON_DISPLAY_0], mainGame->wCardDisplay);
 				if(mcard->code) {
 					mainGame->ShowCardInfo(mcard->code);
 				} else {
-					mainGame->ShowCardNoInfo(mcard->controler);
+					mainGame->ClearCardInfo(mcard->controler);
 				}
 			}
+			if(id == TEXT_CARD_LIST_TIP) {
+				mainGame->stCardListTip->setVisible(true);
+			}
+			break;
+		}
+		case irr::gui::EGET_ELEMENT_LEFT: {
+			if(id >= BUTTON_CARD_0 && id <= BUTTON_CARD_4) {
+				int pos = mainGame->scrCardList->getPos() / 10;
+				ClientCard* mcard = selectable_cards[id - BUTTON_CARD_0 + pos];
+				SetShowMark(mcard, false);
+				mainGame->stCardListTip->setVisible(false);
+			}
+			if(id >= BUTTON_DISPLAY_0 && id <= BUTTON_DISPLAY_4) {
+				int pos = mainGame->scrDisplayList->getPos() / 10;
+				ClientCard* mcard = display_cards[id - BUTTON_DISPLAY_0 + pos];
+				SetShowMark(mcard, false);
+				mainGame->stCardListTip->setVisible(false);
+			}
+			if(id == TEXT_CARD_LIST_TIP) {
+				mainGame->stCardListTip->setVisible(true);
+			}
 			break;
 		}
 		default:
@@ -1419,7 +1444,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 						mcard = remove[hovered_controler].back();
 						if(mcard->position & POS_FACEDOWN) {
 							mcard = 0;
-							mainGame->ShowCardNoInfo(0);
+							mainGame->ClearCardInfo(0);
 						}
 					}
 				} else if(hovered_location == LOCATION_EXTRA) {
@@ -1427,7 +1452,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 						mcard = extra[hovered_controler].back();
 						if(mcard->position & POS_FACEDOWN) {
 							mcard = 0;
-							mainGame->ShowCardNoInfo(0);
+							mainGame->ClearCardInfo(0);
 						}
 					}
 				} else if(hovered_location == LOCATION_DECK) {
@@ -1435,7 +1460,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 						mcard = deck[hovered_controler].back();
 					if(mcard && mcard->position & POS_FACEDOWN) {
 						mcard = 0;
-						mainGame->ShowCardNoInfo(0);
+						mainGame->ClearCardInfo(0);
 					}
 				} else {
 					if(mainGame->Resize(327, 8, 630, 51).isPointInside(mousepos))
@@ -2185,6 +2210,39 @@ void ClientField::SetShowMark(ClientCard* pcard, bool enable) {
 			chit->chain_card->is_showchaintarget = enable;
 	}
 }
+void ClientField::ShowCardInfoInList(ClientCard* pcard, irr::gui::IGUIElement* element, irr::gui::IGUIElement* parent) {
+	std::wstring str(L"");
+	if(pcard->code) {
+		str.append(dataManager.GetName(pcard->code));
+	}
+	for(size_t i = 0; i < chains.size(); ++i) {
+		wchar_t formatBuffer[2048];
+		auto chit = chains[i];
+		if(pcard == chit.chain_card) {
+			myswprintf(formatBuffer, dataManager.GetSysString(216), i + 1);
+			str.append(L"\n").append(formatBuffer);
+		}
+		if(chit.target.find(pcard) != chit.target.end()) {
+			myswprintf(formatBuffer, dataManager.GetSysString(217), i + 1, dataManager.GetName(chit.chain_card->code));
+			str.append(L"\n").append(formatBuffer);
+		}
+	}
+	if(str.length() > 0) {
+		parent->addChild(mainGame->stCardListTip);
+		irr::core::rect<s32> ePos = element->getRelativePosition();
+		s32 x = (ePos.UpperLeftCorner.X + ePos.LowerRightCorner.X) / 2;
+		s32 y = ePos.LowerRightCorner.Y;
+		mainGame->SetStaticText(mainGame->stCardListTip, 320, mainGame->guiFont, str.c_str());
+		irr::core::dimension2d<unsigned int> dTip = mainGame->guiFont->getDimension(mainGame->stCardListTip->getText()) + irr::core::dimension2d<unsigned int>(10, 10);
+		s32 w = dTip.Width / 2;
+		if(x - w < 10)
+			x = w + 10;
+		if(x + w > 670)
+			x = 670 - w;
+		mainGame->stCardListTip->setRelativePosition(recti(x - w, y - 10, x + w, y - 10 + dTip.Height));
+		mainGame->stCardListTip->setVisible(true);
+	}
+}
 void ClientField::SetResponseSelectedCards() const {
 	unsigned char respbuf[64];
 	respbuf[0] = selected_cards.size();

gframe/game.cpp

@@ -41,8 +41,10 @@ bool Game::Initialize() {
 		params.Fullscreen = true;
 	}
 	device = irr::createDeviceEx(params);
-	if(!device)
+	if(!device) {
+		ErrorLog("Failed to create Irrlicht Engine device!");
 		return false;
+	}
 	// Apply skin
 	if (gameConf.skin_index >= 0)
 	{
@@ -76,13 +78,19 @@ bool Game::Initialize() {
 	driver->setTextureCreationFlag(irr::video::ETCF_CREATE_MIP_MAPS, false);
 	driver->setTextureCreationFlag(irr::video::ETCF_OPTIMIZED_FOR_QUALITY, true);
 	imageManager.SetDevice(device);
-	if(!imageManager.Initial())
+	if(!imageManager.Initial()) {
+		ErrorLog("Failed to load textures!");
 		return false;
+	}
 	LoadExpansionDB();
-	if(!dataManager.LoadDB("cards.cdb"))
+	if(!dataManager.LoadDB("cards.cdb")) {
+		ErrorLog("Failed to load card database (cards.cdb)!");
 		return false;
-	if(!dataManager.LoadStrings("strings.conf"))
+	}
+	if(!dataManager.LoadStrings("strings.conf")) {
+		ErrorLog("Failed to load strings!");
 		return false;
+	}
 	dataManager.LoadStrings("./expansions/strings.conf");
 	env = device->getGUIEnvironment();
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
@@ -90,6 +98,10 @@ bool Game::Initialize() {
 	lpcFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 48);
 	guiFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize);
 	textFont = guiFont;
+	if(!numFont || !textFont) {
+		ErrorLog("Failed to load font(s)!");
+		return false;
+	}
 	smgr = device->getSceneManager();
 	device->setWindowCaption(L"EDOPro");
 	device->setResizable(true);
@@ -695,6 +707,11 @@ bool Game::Initialize() {
 	stTip->setBackgroundColor(0xc0ffffff);
 	stTip->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	stTip->setVisible(false);
+	//tip for cards in select / display list
+	stCardListTip = env->addStaticText(L"", rect<s32>(0, 0, 150, 150), false, true, wCardSelect, TEXT_CARD_LIST_TIP, true);
+	stCardListTip->setBackgroundColor(0xc0ffffff);
+	stCardListTip->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
+	stCardListTip->setVisible(false);
 	device->setEventReceiver(&menuHandler);
 	RefreshBGMList();
 	LoadConfig();
@@ -1370,7 +1387,7 @@ void Game::ShowCardInfo(int code, bool resize) {
 	const auto& tsize = stText->getRelativePosition();
 	InitStaticText(stText, tsize.getWidth(), tsize.getHeight(), textFont, showingtext);
 }
-void Game::ShowCardNoInfo(int player) {
+void Game::ClearCardInfo(int player) {
 	imgCard->setImage(imageManager.tCover[player]);
 	stName->setText(L"");
 	stInfo->setText(L"");
@@ -1380,7 +1397,7 @@ void Game::ShowCardNoInfo(int player) {
 	showingcard = 0;
 	scrCardText->setVisible(false);
 }
-void Game::AddChatMsg(wchar_t* msg, int player) {
+void Game::AddChatMsg(const wchar_t* msg, int player) {
 	for(int i = 7; i > 0; --i) {
 		chatMsg[i] = chatMsg[i - 1];
 		chatTiming[i] = chatTiming[i - 1];
@@ -1442,25 +1459,29 @@ void Game::ClearChatMsg() {
 		chatTiming[i] = 0;
 	}
 }
-void Game::AddDebugMsg(char* msg)
-{
+void Game::AddDebugMsg(const char* msg) {
 	if (enable_log & 0x1) {
 		wchar_t wbuf[1024];
 		BufferIO::DecodeUTF8(msg, wbuf);
 		AddChatMsg(wbuf, 9);
 	}
 	if (enable_log & 0x2) {
-		FILE* fp = fopen("error.log", "at");
-		if (!fp)
-			return;
-		time_t nowtime = time(NULL);
-		struct tm *localedtime = localtime(&nowtime);
-		char timebuf[40];
-		strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
-		fprintf(fp, "[%s][Script Error]: %s\n", timebuf, msg);
-		fclose(fp);
+		char msgbuf[1040];
+		sprintf(msgbuf, "[Script Error]: %s", msg);
+		ErrorLog(msgbuf);
 	}
 }
+void Game::ErrorLog(const char* msg) {
+	FILE* fp = fopen("error.log", "at");
+	if(!fp)
+		return;
+	time_t nowtime = time(NULL);
+	struct tm *localedtime = localtime(&nowtime);
+	char timebuf[40];
+	strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
+	fprintf(fp, "[%s]%s\n", timebuf, msg);
+	fclose(fp);
+}
 void Game::ClearTextures() {
 	matManager.mCard.setTexture(0, 0);
 	imgCard->setImage(imageManager.tCover[0]);

gframe/game.h

@@ -129,10 +129,11 @@ public:
 	void LoadConfig();
 	void SaveConfig();
 	void ShowCardInfo(int code, bool resize = false);
-	void ShowCardNoInfo(int player = 0);
-	void AddChatMsg(wchar_t* msg, int player);
+	void ClearCardInfo(int player = 0);
+	void AddChatMsg(const wchar_t* msg, int player);
 	void ClearChatMsg();
-	void AddDebugMsg(char* msgbuf);
+	void AddDebugMsg(const char* msgbuf);
+	void ErrorLog(const char* msgbuf);
 	void ClearTextures();
 	void CloseDuelWindow();
 	bool PlayChant(unsigned int code);
@@ -237,6 +238,7 @@ public:
 	//hint text
 	irr::gui::IGUIStaticText* stHintMsg;
 	irr::gui::IGUIStaticText* stTip;
+	irr::gui::IGUIStaticText* stCardListTip;
 	//infos
 	irr::gui::IGUITabControl* wInfos;
 	irr::gui::IGUIStaticText* stName;
@@ -601,6 +603,7 @@ extern Game* mainGame;
 #define BUTTON_CARD_4				234
 #define SCROLL_CARD_SELECT			235
 #define BUTTON_CARD_SEL_OK			236
+#define TEXT_CARD_LIST_TIP			237
 #define BUTTON_CMD_ACTIVATE			240
 #define BUTTON_CMD_SUMMON			241
 #define BUTTON_CMD_SPSUMMON			242

gframe/lzma/CMakeLists.txt

+project (clzma)
+
+set (AUTO_FILES_RESULT)
+AutoFiles("." "src" "\\.(cpp|c|h)$")
+
+add_library (clzma STATIC ${AUTO_FILES_RESULT})

gframe/menu_handler.cpp

@@ -295,7 +295,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				}
 				if(mainGame->chkYrp->isChecked() && !ReplayMode::cur_replay.LoadYrp())
 					break;
-				mainGame->ShowCardNoInfo();
+				mainGame->ClearCardInfo();
 				mainGame->wCardImg->setVisible(true);
 				mainGame->wInfos->setVisible(true);
 				mainGame->wReplay->setVisible(true);

gframe/premake4.lua

@@ -19,7 +19,7 @@ project "ygopro"
     configuration "not vs*"
         buildoptions { "-std=c++14", "-fno-rtti", "-fpermissive" }
     configuration "not windows"
-        includedirs { "/usr/include/lua", "/usr/include/lua5.3", "/usr/include/lua/5.3", "/usr/include/irrlicht", "/usr/include/freetype2", "../irrKlang/include" }
+        includedirs { "/usr/include/irrlicht", "/usr/include/freetype2", "../irrKlang/include" }
         excludes { "COSOperator.*" }
         libdirs { "../irrKlang/lib" }
         links { "event_pthreads", "GL", "dl", "pthread", "lua5.3" }

gframe/single_mode.cpp

@@ -87,7 +87,7 @@ int SingleMode::SinglePlayThread(void* param) {
 	rh.seed = seed;
 	mainGame->gMutex.Lock();
 	mainGame->HideElement(mainGame->wSinglePlay);
-	mainGame->ShowCardNoInfo();
+	mainGame->ClearCardInfo();
 	mainGame->wCardImg->setVisible(true);
 	mainGame->wInfos->setVisible(true);
 	mainGame->btnLeaveGame->setVisible(true);

lua/CMakeLists.txt

+project (lua)
+
+set (AUTO_FILES_RESULT)
+AutoFiles("." "src" "\\.(cpp|c|h)$" "lua.c|luac.c")
+
+set_source_files_properties(${AUTO_FILES_RESULT} PROPERTIES LANGUAGE CXX)
+
+add_library (lua STATIC ${AUTO_FILES_RESULT})

lua/premake4.lua

+project "lua"
+    kind "StaticLib"
+
+    files { "**.cc", "**.cpp", "**.c", "**.h" }
+    excludes { "lua.c", "luac.c" }
+    
+    configuration "vs*"
+        buildoptions { "/TP" }
+    configuration "not vs*"
+        buildoptions { "-x c++" }

premake4.lua

@@ -33,7 +33,7 @@ solution "ygo"
         defines { "_CRT_SECURE_NO_WARNINGS" }
 
     configuration "not vs*"
-        buildoptions { "-fno-strict-aliasing", "-Wno-multichar" }
+        buildoptions { "-fno-strict-aliasing", "-Wno-format-security" }
     configuration {"not vs*", "windows"}
         buildoptions { "-static-libgcc" }
 
@@ -54,12 +54,12 @@ solution "ygo"
         flags { "OptimizeSpeed" }
         targetdir "bin/release"
 
+    include "lua"
     include "ocgcore"
     include "gframe"
     if os.is("windows") then
     include "event"
     include "freetype"
     include "irrlicht"
-    include "lua"
     include "sqlite3"
     end