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
REIKAI
ygopro
Commits
11cf6384
Commit
11cf6384
authored
May 07, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'setseed' into server
parents
a7b92d5e
cdf9f488
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
1 deletion
+18
-1
gframe/game.cpp
gframe/game.cpp
+1
-0
gframe/game.h
gframe/game.h
+1
-1
gframe/gframe.cpp
gframe/gframe.cpp
+6
-0
gframe/single_duel.cpp
gframe/single_duel.cpp
+5
-0
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+5
-0
No files found.
gframe/game.cpp
View file @
11cf6384
...
@@ -27,6 +27,7 @@ Game* mainGame;
...
@@ -27,6 +27,7 @@ Game* mainGame;
#ifdef YGOPRO_SERVER_MODE
#ifdef YGOPRO_SERVER_MODE
unsigned
short
aServerPort
;
unsigned
short
aServerPort
;
unsigned
short
replay_mode
;
unsigned
short
replay_mode
;
time_t
pre_seed
[
3
];
HostInfo
game_info
;
HostInfo
game_info
;
void
Game
::
MainServerLoop
()
{
void
Game
::
MainServerLoop
()
{
...
...
gframe/game.h
View file @
11cf6384
...
@@ -627,8 +627,8 @@ extern Game* mainGame;
...
@@ -627,8 +627,8 @@ extern Game* mainGame;
extern
unsigned
short
aServerPort
;
extern
unsigned
short
aServerPort
;
extern
unsigned
short
replay_mode
;
extern
unsigned
short
replay_mode
;
extern
HostInfo
game_info
;
extern
HostInfo
game_info
;
extern
time_t
pre_seed
[
3
];
#endif
#endif
}
}
#define CARD_IMG_WIDTH 177
#define CARD_IMG_WIDTH 177
...
...
gframe/gframe.cpp
View file @
11cf6384
...
@@ -74,6 +74,8 @@ int main(int argc, char* argv[]) {
...
@@ -74,6 +74,8 @@ int main(int argc, char* argv[]) {
ygo
::
game_info
.
no_shuffle_deck
=
false
;
ygo
::
game_info
.
no_shuffle_deck
=
false
;
ygo
::
game_info
.
duel_rule
=
DEFAULT_DUEL_RULE
;
ygo
::
game_info
.
duel_rule
=
DEFAULT_DUEL_RULE
;
ygo
::
game_info
.
time_limit
=
180
;
ygo
::
game_info
.
time_limit
=
180
;
for
(
int
i
=
0
;
i
<
3
;
++
i
)
ygo
::
pre_seed
[
i
]
=
(
time_t
)
0
;
if
(
argc
==
2
)
{
if
(
argc
==
2
)
{
int
code
=
atoi
(
argv
[
1
]);
int
code
=
atoi
(
argv
[
1
]);
ygo
::
mainGame
=
&
_game
;
ygo
::
mainGame
=
&
_game
;
...
@@ -115,6 +117,10 @@ int main(int argc, char* argv[]) {
...
@@ -115,6 +117,10 @@ int main(int argc, char* argv[]) {
ygo
::
game_info
.
draw_count
=
atoi
(
argv
[
10
]);
ygo
::
game_info
.
draw_count
=
atoi
(
argv
[
10
]);
ygo
::
game_info
.
time_limit
=
atoi
(
argv
[
11
]);
ygo
::
game_info
.
time_limit
=
atoi
(
argv
[
11
]);
ygo
::
replay_mode
=
atoi
(
argv
[
12
]);
ygo
::
replay_mode
=
atoi
(
argv
[
12
]);
for
(
int
i
=
13
;
(
i
<
argc
&&
i
<=
15
)
;
++
i
)
{
ygo
::
pre_seed
[
i
-
13
]
=
(
time_t
)
atoi
(
argv
[
i
]);
}
}
}
ygo
::
mainGame
=
&
_game
;
ygo
::
mainGame
=
&
_game
;
ygo
::
mainGame
->
MainServerLoop
();
ygo
::
mainGame
->
MainServerLoop
();
...
...
gframe/single_duel.cpp
View file @
11cf6384
...
@@ -537,6 +537,11 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
...
@@ -537,6 +537,11 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
rh
.
version
=
PRO_VERSION
;
rh
.
version
=
PRO_VERSION
;
rh
.
flag
=
0
;
rh
.
flag
=
0
;
time_t
seed
=
time
(
0
);
time_t
seed
=
time
(
0
);
#ifdef YGOPRO_SERVER_MODE
if
(
pre_seed
[
duel_count
]
>
0
)
{
seed
=
pre_seed
[
duel_count
];
}
#endif
rh
.
seed
=
seed
;
rh
.
seed
=
seed
;
last_replay
.
BeginRecord
();
last_replay
.
BeginRecord
();
last_replay
.
WriteHeader
(
rh
);
last_replay
.
WriteHeader
(
rh
);
...
...
gframe/tag_duel.cpp
View file @
11cf6384
...
@@ -506,6 +506,11 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
...
@@ -506,6 +506,11 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
rh
.
flag
=
REPLAY_TAG
;
rh
.
flag
=
REPLAY_TAG
;
time_t
seed
=
time
(
0
);
time_t
seed
=
time
(
0
);
rh
.
seed
=
seed
;
rh
.
seed
=
seed
;
#ifdef YGOPRO_SERVER_MODE
if
(
pre_seed
[
0
]
>
0
)
{
seed
=
pre_seed
[
0
];
}
#endif
last_replay
.
BeginRecord
();
last_replay
.
BeginRecord
();
last_replay
.
WriteHeader
(
rh
);
last_replay
.
WriteHeader
(
rh
);
rnd
.
reset
(
seed
);
rnd
.
reset
(
seed
);
...
...
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