Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
YGOPRO-520DIY
ygopro
Commits
968d5f19
Commit
968d5f19
authored
Nov 28, 2024
by
wind2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'server' into server-develop
parents
94769ffb
a1b8730a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
17 deletions
+36
-17
appveyor.yml
appveyor.yml
+14
-14
gframe/game.cpp
gframe/game.cpp
+2
-1
gframe/game.h
gframe/game.h
+1
-1
premake/irrlicht/irrlicht.patch
premake/irrlicht/irrlicht.patch
+19
-1
No files found.
appveyor.yml
View file @
968d5f19
version
:
'
{build}'
image
:
Visual Studio
20
19
image
:
Visual Studio
20
22
environment
:
matrix
:
-
SERVER_MODE
:
true
...
...
@@ -9,25 +9,25 @@ install:
-
git submodule update --init --recursive
# environment and system dependency
-
bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/premake/premake-core/releases/download/v5.0.0-beta
2/premake-5.0.0-beta2
-windows.zip ; exit 0"
-
7z x premake-5.0.0-beta
2
-windows.zip
-
bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/premake/premake-core/releases/download/v5.0.0-beta
3/premake-5.0.0-beta3
-windows.zip ; exit 0"
-
7z x premake-5.0.0-beta
3
-windows.zip
-
bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz ; exit 0"
-
tar xf libevent-2.0.22-stable.tar.gz
-
move libevent-2.0.22-stable event
-
xcopy /E event\WIN32-Code event\include
-
bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.lua.org/ftp/lua-5.4.
4
.tar.gz ; exit 0"
-
tar xf lua-5.4.
4
.tar.gz
-
move lua-5.4.
4
lua
-
bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.lua.org/ftp/lua-5.4.
7
.tar.gz ; exit 0"
-
tar xf lua-5.4.
7
.tar.gz
-
move lua-5.4.
7
lua
-
bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.sqlite.org/202
2/sqlite-amalgamation-33903
00.zip ; exit 0"
-
7z x sqlite-amalgamation-3
3903
00.zip
-
move sqlite-amalgamation-3
3903
00 sqlite3
-
bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.sqlite.org/202
4/sqlite-amalgamation-34700
00.zip ; exit 0"
-
7z x sqlite-amalgamation-3
4700
00.zip
-
move sqlite-amalgamation-3
4700
00 sqlite3
before_build
:
-
xcopy /E premake\* .
-
premake5 vs20
19
-
premake5 vs20
22
configuration
:
Release
...
...
@@ -54,7 +54,7 @@ for:
-
patch -p1 < irrlicht.patch
-
cd ..
-
premake5 vs20
19
-
premake5 vs20
22
after_build
:
-
ps
:
move bin\release\AI.Server.exe .
...
...
@@ -64,8 +64,8 @@ for:
name
:
YGOPro server for YGOPro2 AI
cache
:
-
premake-5.0.0-beta
2
-windows.zip
-
premake-5.0.0-beta
3
-windows.zip
-
libevent-2.0.22-stable.tar.gz
-
irrlicht-1.8.5.zip
-
lua-5.4.
4
.tar.gz
-
sqlite-amalgamation-3
3903
00.zip
-
lua-5.4.
7
.tar.gz
-
sqlite-amalgamation-3
4700
00.zip
gframe/game.cpp
View file @
968d5f19
...
...
@@ -103,6 +103,7 @@ void Game::MainServerLoop() {
}
}
#else //YGOPRO_SERVER_MODE
bool
Game
::
Initialize
()
{
LoadConfig
();
irr
::
SIrrlichtCreationParameters
params
=
irr
::
SIrrlichtCreationParameters
();
...
...
@@ -1217,7 +1218,7 @@ void Game::LoadExpansions() {
FileSystem
::
TraversalDir
(
L"./cdb"
,
[](
const
wchar_t
*
name
,
bool
isdir
)
{
wchar_t
fpath
[
1024
];
myswprintf
(
fpath
,
L"./cdb/%ls"
,
name
);
if
(
!
isdir
&&
wcsrchr
(
name
,
'.'
)
&&
!
mywcsncasecmp
(
wcsrchr
(
name
,
'.'
),
L".cdb"
,
4
))
{
if
(
!
isdir
&&
IsExtension
(
name
,
L".cdb"
))
{
dataManager
.
LoadDB
(
fpath
);
}
});
...
...
gframe/game.h
View file @
968d5f19
...
...
@@ -30,7 +30,7 @@
#define YGOPRO_DEFAULT_DUEL_RULE 5
#endif
constexpr
int
DEFAULT_DUEL_RULE
=
YGOPRO_DEFAULT_DUEL_RULE
;
#define DEFAULT_DUEL_RULE YGOPRO_DEFAULT_DUEL_RULE
constexpr
int
CONFIG_LINE_SIZE
=
1024
;
namespace
ygo
{
...
...
premake/irrlicht/irrlicht.patch
View file @
968d5f19
...
...
@@ -37,7 +37,7 @@ index 43557cd..ffa06bc 100644
} // end namespace core
} // end namespace irr
diff --git a/include/irrTypes.h b/include/irrTypes.h
index 403f890..
940e859
100644
index 403f890..
bfa13f4
100644
--- a/include/irrTypes.h
+++ b/include/irrTypes.h
@@ -48,6 +48,9 @@
typedef __int16 s16;
...
...
@@ -50,6 +50,24 @@ index 403f890..940e859 100644
//! 32 bit unsigned variable.
@@ -113,17 +116,6 @@
typedef double f64;
#include <wchar.h>
#ifdef _IRR_WINDOWS_API_
-//! Defines for s{w,n}printf because these methods do not match the ISO C
-//! standard on Windows platforms, but it does on all others.
-//! These should be int snprintf(char *str, size_t size, const char *format, ...);
-//! and int swprintf(wchar_t *wcs, size_t maxlen, const wchar_t *format, ...);
-#if defined(_MSC_VER) && _MSC_VER > 1310 && !defined (_WIN32_WCE)
-#define swprintf swprintf_s
-#define snprintf sprintf_s
-#elif !defined(__CYGWIN__)
-#define swprintf _snwprintf
-#define snprintf _snprintf
-#endif
// define the wchar_t type if not already built in.
#ifdef _MSC_VER
diff --git a/source/Irrlicht/CGUIEditBox.cpp b/source/Irrlicht/CGUIEditBox.cpp
index 395fb69..cc6b75f 100644
--- a/source/Irrlicht/CGUIEditBox.cpp
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment