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
nanahira
ygopro
Commits
5c2835da
Commit
5c2835da
authored
Jun 27, 2025
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-remove-ready-server' of ../versions/ygopro-mc into server-develop
parents
254a3d54
5d271ad0
Pipeline
#38139
failed with stages
in 108 minutes and 54 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
8 deletions
+14
-8
gframe/netserver.cpp
gframe/netserver.cpp
+1
-1
gframe/premake5.lua
gframe/premake5.lua
+3
-0
gframe/single_duel.cpp
gframe/single_duel.cpp
+2
-2
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+3
-3
premake5.lua
premake5.lua
+5
-2
No files found.
gframe/netserver.cpp
View file @
5c2835da
...
...
@@ -437,7 +437,7 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
duel_mode
->
ToObserver
(
dp
);
break
;
}
#if
defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#if
def YGOPRO_SERVER_MODE
case
CTOS_HS_NOTREADY
:
{
if
(
!
duel_mode
||
duel_mode
->
pduel
)
return
;
...
...
gframe/premake5.lua
View file @
5c2835da
...
...
@@ -39,6 +39,9 @@ end
if
SERVER_PRO2_SUPPORT
then
defines
{
"SERVER_PRO2_SUPPORT"
}
end
if
SERVER_TAG_SURRENDER_CONFIRM
then
defines
{
"SERVER_TAG_SURRENDER_CONFIRM"
}
end
else
project
"ygopro"
kind
"WindowedApp"
...
...
gframe/single_duel.cpp
View file @
5c2835da
...
...
@@ -408,7 +408,7 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
#endif
valid
=
false
;
if
(
!
valid
)
{
#if
defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#if
def YGOPRO_SERVER_MODE
if
(
duel_count
==
0
)
{
STOC_HS_PlayerChange
scpc
;
scpc
.
status
=
(
dp
->
type
<<
4
)
|
PLAYERCHANGE_NOTREADY
;
...
...
@@ -423,7 +423,7 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
}
if
(
duel_count
==
0
)
{
deck_error
[
dp
->
type
]
=
DeckManager
::
LoadDeck
(
pdeck
[
dp
->
type
],
deckbuf
.
list
,
deckbuf
.
mainc
,
deckbuf
.
sidec
);
#if
defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#if
def YGOPRO_SERVER_MODE
PlayerReady
(
dp
,
true
);
#endif
}
else
{
...
...
gframe/tag_duel.cpp
View file @
5c2835da
...
...
@@ -394,7 +394,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
#endif
valid
=
false
;
if
(
!
valid
)
{
#if
defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#if
def YGOPRO_SERVER_MODE
STOC_HS_PlayerChange
scpc
;
scpc
.
status
=
(
dp
->
type
<<
4
)
|
PLAYERCHANGE_NOTREADY
;
NetServer
::
SendPacketToPlayer
(
dp
,
STOC_HS_PLAYER_CHANGE
,
scpc
);
...
...
@@ -406,7 +406,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
return
;
}
deck_error
[
dp
->
type
]
=
DeckManager
::
LoadDeck
(
pdeck
[
dp
->
type
],
deckbuf
.
list
,
deckbuf
.
mainc
,
deckbuf
.
sidec
);
#if
defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#if
def YGOPRO_SERVER_MODE
PlayerReady
(
dp
,
true
);
#endif
}
...
...
@@ -736,7 +736,7 @@ void TagDuel::Surrender(DuelPlayer* dp) {
if
(
dp
->
type
>
3
||
!
pduel
)
return
;
uint32_t
player
=
dp
->
type
;
#if !defined(YGOPRO_SERVER_MODE) || defined(
YGOPRO_
SERVER_TAG_SURRENDER_CONFIRM)
#if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_TAG_SURRENDER_CONFIRM)
if
(
surrender
[
player
])
return
;
static
const
uint32_t
teammatemap
[]
=
{
1
,
0
,
3
,
2
};
...
...
premake5.lua
View file @
5c2835da
...
...
@@ -29,6 +29,7 @@ IRRKLANG_PRO_BUILD_IKPMP3 = false
SERVER_MODE
=
true
SERVER_ZIP_SUPPORT
=
false
SERVER_PRO2_SUPPORT
=
false
SERVER_TAG_SURRENDER_CONFIRM
=
false
SERVER_PRO3_SUPPORT
=
false
USE_IRRKLANG
=
false
...
...
@@ -97,6 +98,7 @@ newoption { trigger = "server-mode", category = "YGOPro - server", description =
newoption
{
trigger
=
"server-zip-support"
,
category
=
"YGOPro - server"
,
description
=
""
}
newoption
{
trigger
=
"server-pro2-support"
,
category
=
"YGOPro - server"
,
description
=
""
}
newoption
{
trigger
=
"server-pro3-support"
,
category
=
"YGOPro - server"
,
description
=
""
}
newoption
{
trigger
=
"server-tag-surrender-confirm"
,
category
=
"YGOPro - server"
,
description
=
""
}
boolOptions
=
{
"compat-mycard"
,
...
...
@@ -106,8 +108,6 @@ boolOptions = {
"enable-debug-func"
,
"log-lua-memory-size"
,
"log-in-chat"
,
"server-tag-surrender-confirm"
,
"server-receive-ready"
,
}
for
_
,
boolOption
in
ipairs
(
boolOptions
)
do
...
...
@@ -170,6 +170,9 @@ if GetParam("server-pro3-support") then
SERVER_ZIP_SUPPORT
=
true
SERVER_TAG_SURRENDER_CONFIRM
=
true
end
if
GetParam
(
"server-tag-surrender-confirm"
)
then
SERVER_TAG_SURRENDER_CONFIRM
=
true
end
if
GetParam
(
"build-lua"
)
then
BUILD_LUA
=
true
...
...
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