Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-core
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
nanahira
ygopro-core
Commits
6fcc1207
Commit
6fcc1207
authored
May 14, 2025
by
wind2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master'
parents
0e03afc3
e15beaab
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
11 deletions
+4
-11
libdebug.cpp
libdebug.cpp
+1
-0
ocgapi.h
ocgapi.h
+1
-1
operations.cpp
operations.cpp
+1
-1
premake/dll.lua
premake/dll.lua
+1
-5
premake/lua.lua
premake/lua.lua
+0
-1
premake5.lua
premake5.lua
+0
-3
No files found.
libdebug.cpp
View file @
6fcc1207
...
...
@@ -14,6 +14,7 @@
#include "ocgapi.h"
int32_t
scriptlib
::
debug_message
(
lua_State
*
L
)
{
check_param_count
(
L
,
1
);
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
lua_getglobal
(
L
,
"tostring"
);
lua_pushvalue
(
L
,
-
2
);
...
...
ocgapi.h
View file @
6fcc1207
...
...
@@ -10,7 +10,7 @@
#include "common.h"
#ifdef WIN32
#ifdef
_
WIN32
#define DECL_DLLEXPORT __declspec(dllexport)
#else
#define DECL_DLLEXPORT
...
...
operations.cpp
View file @
6fcc1207
...
...
@@ -1299,9 +1299,9 @@ int32_t field::trap_monster_adjust(uint16_t step) {
if
(
fcount
<=
0
)
{
for
(
auto
&
pcard
:
core
.
trap_monster_adjust_set
[
check_player
])
{
to_grave_set
->
insert
(
pcard
);
core
.
units
.
begin
()
->
step
=
2
;
}
core
.
trap_monster_adjust_set
[
check_player
].
clear
();
core
.
units
.
begin
()
->
step
=
2
;
}
else
if
((
int32_t
)
core
.
trap_monster_adjust_set
[
check_player
].
size
()
>
fcount
)
{
uint32_t
ct
=
(
uint32_t
)
core
.
trap_monster_adjust_set
[
check_player
].
size
()
-
fcount
;
core
.
select_cards
.
clear
();
...
...
premake/dll.lua
View file @
6fcc1207
...
...
@@ -31,7 +31,6 @@ workspace "ocgcoredll"
defines
"_DEBUG"
filter
"system:windows"
defines
{
"WIN32"
,
"_WIN32"
}
systemversion
"latest"
startproject
"ocgcore"
...
...
@@ -50,9 +49,6 @@ workspace "ocgcoredll"
buildoptions
{
"/utf-8"
}
defines
{
"_CRT_SECURE_NO_WARNINGS"
}
filter
"not action:vs*"
buildoptions
{
}
filter
"system:bsd"
defines
{
"LUA_USE_POSIX"
}
...
...
@@ -61,7 +57,7 @@ workspace "ocgcoredll"
filter
"system:linux"
defines
{
"LUA_USE_LINUX"
}
buildoptions
{
"-fPIC"
}
pic
"On"
filter
{}
...
...
premake/lua.lua
View file @
6fcc1207
...
...
@@ -16,4 +16,3 @@ project "lua"
filter
"system:linux"
defines
{
"LUA_USE_LINUX"
}
buildoptions
{
"-fPIC"
}
premake5.lua
View file @
6fcc1207
...
...
@@ -12,9 +12,6 @@ project "ocgcore"
libdirs
{
LUA_LIB_DIR
}
end
filter
"not action:vs*"
buildoptions
{
}
filter
"system:bsd"
defines
{
"LUA_USE_POSIX"
}
...
...
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