Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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
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
MyCard
ygopro-2pick
Commits
cb5b9c31
Commit
cb5b9c31
authored
Sep 07, 2017
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build
parent
1bee9e12
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
41 additions
and
45 deletions
+41
-45
README.md
README.md
+1
-1
appveyor.yml
appveyor.yml
+2
-3
gframe/client_field.cpp
gframe/client_field.cpp
+7
-0
gframe/config.h
gframe/config.h
+1
-2
gframe/game.cpp
gframe/game.cpp
+6
-16
gframe/gframe.cpp
gframe/gframe.cpp
+0
-7
gframe/menu_handler.cpp
gframe/menu_handler.cpp
+4
-4
gframe/replay.cpp
gframe/replay.cpp
+7
-0
gframe/replay.h
gframe/replay.h
+1
-0
gframe/replay_mode.cpp
gframe/replay_mode.cpp
+12
-12
No files found.
README.md
View file @
cb5b9c31
# ygopro-freever
# ygopro-koishibuild
\ No newline at end of file
\ No newline at end of file
appveyor.yml
View file @
cb5b9c31
...
@@ -56,13 +56,12 @@ build:
...
@@ -56,13 +56,12 @@ build:
after_build
:
after_build
:
-
ps
:
move bin\release\ygopro.exe .
-
ps
:
move bin\release\ygopro.exe .
-
rename ygopro.exe ygopro_freever.exe
test
:
off
test
:
off
artifacts
:
artifacts
:
-
path
:
ygopro
_freever
.exe
-
path
:
ygopro.exe
name
:
ygopro
freever
name
:
ygopro
temp build
cache
:
cache
:
-
premake-5.0.0-alpha12-windows.zip
-
premake-5.0.0-alpha12-windows.zip
...
...
gframe/client_field.cpp
View file @
cb5b9c31
...
@@ -76,6 +76,13 @@ void ClientField::Clear() {
...
@@ -76,6 +76,13 @@ void ClientField::Clear() {
reposable_cards
.
clear
();
reposable_cards
.
clear
();
attackable_cards
.
clear
();
attackable_cards
.
clear
();
disabled_field
=
0
;
disabled_field
=
0
;
panel
=
0
;
hovered_card
=
0
;
clicked_card
=
0
;
highlighting_card
=
0
;
hovered_controler
=
0
;
hovered_location
=
0
;
hovered_sequence
=
0
;
deck_act
=
false
;
deck_act
=
false
;
grave_act
=
false
;
grave_act
=
false
;
remove_act
=
false
;
remove_act
=
false
;
...
...
gframe/config.h
View file @
cb5b9c31
...
@@ -72,8 +72,7 @@ using namespace video;
...
@@ -72,8 +72,7 @@ using namespace video;
using
namespace
io
;
using
namespace
io
;
using
namespace
gui
;
using
namespace
gui
;
//modded
extern
const
unsigned
short
PRO_VERSION
;
extern
int
PRO_VERSION
;
extern
int
enable_log
;
extern
int
enable_log
;
extern
bool
exit_on_return
;
extern
bool
exit_on_return
;
extern
bool
open_file
;
extern
bool
open_file
;
...
...
gframe/game.cpp
View file @
cb5b9c31
...
@@ -14,8 +14,7 @@
...
@@ -14,8 +14,7 @@
#include <dirent.h>
#include <dirent.h>
#endif
#endif
//modded
const
unsigned
short
PRO_VERSION
=
0x133F
;
int
PRO_VERSION
=
0x133F
;
namespace
ygo
{
namespace
ygo
{
...
@@ -68,8 +67,7 @@ bool Game::Initialize() {
...
@@ -68,8 +67,7 @@ bool Game::Initialize() {
guiFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
textfont
,
gameConf
.
textfontsize
);
guiFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
textfont
,
gameConf
.
textfontsize
);
textFont
=
guiFont
;
textFont
=
guiFont
;
smgr
=
device
->
getSceneManager
();
smgr
=
device
->
getSceneManager
();
//modded
device
->
setWindowCaption
(
L"YGOPro"
);
device
->
setWindowCaption
(
L"YGOPro Freever"
);
device
->
setResizable
(
false
);
device
->
setResizable
(
false
);
#ifdef _WIN32
#ifdef _WIN32
irr
::
video
::
SExposedVideoData
exposedData
=
driver
->
getExposedVideoData
();
irr
::
video
::
SExposedVideoData
exposedData
=
driver
->
getExposedVideoData
();
...
@@ -88,7 +86,7 @@ bool Game::Initialize() {
...
@@ -88,7 +86,7 @@ bool Game::Initialize() {
//main menu
//main menu
wchar_t
strbuf
[
256
];
wchar_t
strbuf
[
256
];
//modded
//modded
myswprintf
(
strbuf
,
L"YGOPro
Custom
Version:%X.0%X.%X"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
myswprintf
(
strbuf
,
L"YGOPro Version:%X.0%X.%X"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
wMainMenu
=
env
->
addWindow
(
rect
<
s32
>
(
370
,
200
,
650
,
415
),
false
,
strbuf
);
wMainMenu
=
env
->
addWindow
(
rect
<
s32
>
(
370
,
200
,
650
,
415
),
false
,
strbuf
);
wMainMenu
->
getCloseButton
()
->
setVisible
(
false
);
wMainMenu
->
getCloseButton
()
->
setVisible
(
false
);
btnLanMode
=
env
->
addButton
(
rect
<
s32
>
(
10
,
30
,
270
,
60
),
wMainMenu
,
BUTTON_LAN_MODE
,
dataManager
.
GetSysString
(
1200
));
btnLanMode
=
env
->
addButton
(
rect
<
s32
>
(
10
,
30
,
270
,
60
),
wMainMenu
,
BUTTON_LAN_MODE
,
dataManager
.
GetSysString
(
1200
));
...
@@ -728,8 +726,7 @@ void Game::MainLoop() {
...
@@ -728,8 +726,7 @@ void Game::MainLoop() {
usleep
(
20000
);
usleep
(
20000
);
#endif
#endif
if
(
cur_time
>=
1000
)
{
if
(
cur_time
>=
1000
)
{
//modded
myswprintf
(
cap
,
L"YGOPro FPS: %d"
,
fps
);
myswprintf
(
cap
,
L"YGOPro Freever FPS: %d"
,
fps
);
device
->
setWindowCaption
(
cap
);
device
->
setWindowCaption
(
cap
);
fps
=
0
;
fps
=
0
;
cur_time
-=
1000
;
cur_time
-=
1000
;
...
@@ -978,8 +975,7 @@ void Game::RefershBGMDir(std::wstring path, int scene) {
...
@@ -978,8 +975,7 @@ void Game::RefershBGMDir(std::wstring path, int scene) {
#endif
#endif
}
}
void
Game
::
LoadConfig
()
{
void
Game
::
LoadConfig
()
{
//modded
FILE
*
fp
=
fopen
(
"system.conf"
,
"r"
);
FILE
*
fp
=
fopen
(
"system_freever.conf"
,
"r"
);
if
(
!
fp
)
if
(
!
fp
)
return
;
return
;
char
linebuf
[
256
];
char
linebuf
[
256
];
...
@@ -1025,9 +1021,6 @@ void Game::LoadConfig() {
...
@@ -1025,9 +1021,6 @@ void Game::LoadConfig() {
gameConf
.
antialias
=
atoi
(
valbuf
);
gameConf
.
antialias
=
atoi
(
valbuf
);
}
else
if
(
!
strcmp
(
strbuf
,
"use_d3d"
))
{
}
else
if
(
!
strcmp
(
strbuf
,
"use_d3d"
))
{
gameConf
.
use_d3d
=
atoi
(
valbuf
)
>
0
;
gameConf
.
use_d3d
=
atoi
(
valbuf
)
>
0
;
//modded
}
else
if
(
!
strcmp
(
strbuf
,
"version"
))
{
PRO_VERSION
=
atoi
(
valbuf
);
}
else
if
(
!
strcmp
(
strbuf
,
"use_image_scale"
))
{
}
else
if
(
!
strcmp
(
strbuf
,
"use_image_scale"
))
{
gameConf
.
use_image_scale
=
atoi
(
valbuf
)
>
0
;
gameConf
.
use_image_scale
=
atoi
(
valbuf
)
>
0
;
}
else
if
(
!
strcmp
(
strbuf
,
"errorlog"
))
{
}
else
if
(
!
strcmp
(
strbuf
,
"errorlog"
))
{
...
@@ -1108,13 +1101,10 @@ void Game::LoadConfig() {
...
@@ -1108,13 +1101,10 @@ void Game::LoadConfig() {
fclose
(
fp
);
fclose
(
fp
);
}
}
void
Game
::
SaveConfig
()
{
void
Game
::
SaveConfig
()
{
//modded
FILE
*
fp
=
fopen
(
"system.conf"
,
"w"
);
FILE
*
fp
=
fopen
(
"system_freever.conf"
,
"w"
);
fprintf
(
fp
,
"#config file
\n
#nickname & gamename should be less than 20 characters
\n
"
);
fprintf
(
fp
,
"#config file
\n
#nickname & gamename should be less than 20 characters
\n
"
);
char
linebuf
[
256
];
char
linebuf
[
256
];
fprintf
(
fp
,
"use_d3d = %d
\n
"
,
gameConf
.
use_d3d
?
1
:
0
);
fprintf
(
fp
,
"use_d3d = %d
\n
"
,
gameConf
.
use_d3d
?
1
:
0
);
//modded
fprintf
(
fp
,
"version = %d
\n
"
,
PRO_VERSION
);
fprintf
(
fp
,
"use_image_scale = %d
\n
"
,
gameConf
.
use_image_scale
?
1
:
0
);
fprintf
(
fp
,
"use_image_scale = %d
\n
"
,
gameConf
.
use_image_scale
?
1
:
0
);
fprintf
(
fp
,
"antialias = %d
\n
"
,
gameConf
.
antialias
);
fprintf
(
fp
,
"antialias = %d
\n
"
,
gameConf
.
antialias
);
fprintf
(
fp
,
"errorlog = %d
\n
"
,
enable_log
);
fprintf
(
fp
,
"errorlog = %d
\n
"
,
enable_log
);
...
...
gframe/gframe.cpp
View file @
cb5b9c31
...
@@ -72,13 +72,6 @@ int main(int argc, char* argv[]) {
...
@@ -72,13 +72,6 @@ int main(int argc, char* argv[]) {
GetParameter
(
param
,
&
argv
[
i
][
0
]);
GetParameter
(
param
,
&
argv
[
i
][
0
]);
ygo
::
dataManager
.
LoadDB
(
param
);
ygo
::
dataManager
.
LoadDB
(
param
);
continue
;
continue
;
//modded
}
else
if
(
!
strcmp
(
argv
[
i
],
"-v"
))
{
// version
++
i
;
char
param
[
128
];
GetParameter
(
param
,
&
argv
[
i
][
0
]);
PRO_VERSION
=
atoi
(
param
);
continue
;
}
else
if
(
!
strcmp
(
argv
[
i
],
"-n"
))
{
// nickName
}
else
if
(
!
strcmp
(
argv
[
i
],
"-n"
))
{
// nickName
++
i
;
++
i
;
wchar_t
param
[
128
];
wchar_t
param
[
128
];
...
...
gframe/menu_handler.cpp
View file @
cb5b9c31
...
@@ -306,11 +306,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
...
@@ -306,11 +306,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
myswprintf
(
infobuf
,
L"%d/%d/%d %02d:%02d:%02d
\n
"
,
st
->
tm_year
+
1900
,
st
->
tm_mon
+
1
,
st
->
tm_mday
,
st
->
tm_hour
,
st
->
tm_min
,
st
->
tm_sec
);
myswprintf
(
infobuf
,
L"%d/%d/%d %02d:%02d:%02d
\n
"
,
st
->
tm_year
+
1900
,
st
->
tm_mon
+
1
,
st
->
tm_mday
,
st
->
tm_hour
,
st
->
tm_min
,
st
->
tm_sec
);
repinfo
.
append
(
infobuf
);
repinfo
.
append
(
infobuf
);
wchar_t
namebuf
[
4
][
20
];
wchar_t
namebuf
[
4
][
20
];
BufferIO
::
CopyWStr
((
unsigned
short
*
)
&
ReplayMode
::
cur_replay
.
replay_data
[
0
],
namebuf
[
0
],
20
);
ReplayMode
::
cur_replay
.
ReadName
(
namebuf
[
0
]
);
BufferIO
::
CopyWStr
((
unsigned
short
*
)
&
ReplayMode
::
cur_replay
.
replay_data
[
40
],
namebuf
[
1
],
20
);
ReplayMode
::
cur_replay
.
ReadName
(
namebuf
[
1
]
);
if
(
ReplayMode
::
cur_replay
.
pheader
.
flag
&
REPLAY_TAG
)
{
if
(
ReplayMode
::
cur_replay
.
pheader
.
flag
&
REPLAY_TAG
)
{
BufferIO
::
CopyWStr
((
unsigned
short
*
)
&
ReplayMode
::
cur_replay
.
replay_data
[
80
],
namebuf
[
2
],
20
);
ReplayMode
::
cur_replay
.
ReadName
(
namebuf
[
2
]
);
BufferIO
::
CopyWStr
((
unsigned
short
*
)
&
ReplayMode
::
cur_replay
.
replay_data
[
120
],
namebuf
[
3
],
20
);
ReplayMode
::
cur_replay
.
ReadName
(
namebuf
[
3
]
);
}
}
if
(
ReplayMode
::
cur_replay
.
pheader
.
flag
&
REPLAY_TAG
)
if
(
ReplayMode
::
cur_replay
.
pheader
.
flag
&
REPLAY_TAG
)
myswprintf
(
infobuf
,
L"%ls
\n
%ls
\n
===VS===
\n
%ls
\n
%ls
\n
"
,
namebuf
[
0
],
namebuf
[
1
],
namebuf
[
2
],
namebuf
[
3
]);
myswprintf
(
infobuf
,
L"%ls
\n
%ls
\n
===VS===
\n
%ls
\n
%ls
\n
"
,
namebuf
[
0
],
namebuf
[
1
],
namebuf
[
2
],
namebuf
[
3
]);
...
...
gframe/replay.cpp
View file @
cb5b9c31
...
@@ -202,6 +202,13 @@ bool Replay::ReadNextResponse(unsigned char resp[64]) {
...
@@ -202,6 +202,13 @@ bool Replay::ReadNextResponse(unsigned char resp[64]) {
pdata
+=
len
;
pdata
+=
len
;
return
true
;
return
true
;
}
}
void
Replay
::
ReadName
(
wchar_t
*
data
)
{
if
(
!
is_replaying
)
return
;
unsigned
short
buffer
[
20
];
ReadData
(
buffer
,
40
);
BufferIO
::
CopyWStr
(
buffer
,
data
,
20
);
}
void
Replay
::
ReadData
(
void
*
data
,
unsigned
int
length
)
{
void
Replay
::
ReadData
(
void
*
data
,
unsigned
int
length
)
{
if
(
!
is_replaying
)
if
(
!
is_replaying
)
return
;
return
;
...
...
gframe/replay.h
View file @
cb5b9c31
...
@@ -36,6 +36,7 @@ public:
...
@@ -36,6 +36,7 @@ public:
bool
OpenReplay
(
const
wchar_t
*
name
);
bool
OpenReplay
(
const
wchar_t
*
name
);
static
bool
CheckReplay
(
const
wchar_t
*
name
);
static
bool
CheckReplay
(
const
wchar_t
*
name
);
bool
ReadNextResponse
(
unsigned
char
resp
[
64
]);
bool
ReadNextResponse
(
unsigned
char
resp
[
64
]);
void
ReadName
(
wchar_t
*
data
);
void
ReadHeader
(
ReplayHeader
&
header
);
void
ReadHeader
(
ReplayHeader
&
header
);
void
ReadData
(
void
*
data
,
unsigned
int
length
);
void
ReadData
(
void
*
data
,
unsigned
int
length
);
int
ReadInt32
();
int
ReadInt32
();
...
...
gframe/replay_mode.cpp
View file @
cb5b9c31
...
@@ -61,16 +61,16 @@ int ReplayMode::ReplayThread(void* param) {
...
@@ -61,16 +61,16 @@ int ReplayMode::ReplayThread(void* param) {
int
seed
=
rh
.
seed
;
int
seed
=
rh
.
seed
;
rnd
.
reset
(
seed
);
rnd
.
reset
(
seed
);
if
(
rh
.
flag
&
REPLAY_TAG
)
{
if
(
rh
.
flag
&
REPLAY_TAG
)
{
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
hostname
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
hostname
);
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
hostname_tag
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
hostname_tag
);
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
clientname_tag
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
clientname_tag
);
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
clientname
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
clientname
);
mainGame
->
dInfo
.
isTag
=
true
;
mainGame
->
dInfo
.
isTag
=
true
;
mainGame
->
dInfo
.
tag_player
[
0
]
=
false
;
mainGame
->
dInfo
.
tag_player
[
0
]
=
false
;
mainGame
->
dInfo
.
tag_player
[
1
]
=
false
;
mainGame
->
dInfo
.
tag_player
[
1
]
=
false
;
}
else
{
}
else
{
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
hostname
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
hostname
);
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
clientname
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
clientname
);
}
}
set_script_reader
(
default_script_reader
);
set_script_reader
(
default_script_reader
);
set_card_reader
((
card_reader
)
DataManager
::
CardReader
);
set_card_reader
((
card_reader
)
DataManager
::
CardReader
);
...
@@ -209,16 +209,16 @@ void ReplayMode::Restart(bool refresh) {
...
@@ -209,16 +209,16 @@ void ReplayMode::Restart(bool refresh) {
int
seed
=
rh
.
seed
;
int
seed
=
rh
.
seed
;
rnd
.
reset
(
seed
);
rnd
.
reset
(
seed
);
if
(
rh
.
flag
&
REPLAY_TAG
)
{
if
(
rh
.
flag
&
REPLAY_TAG
)
{
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
hostname
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
hostname
);
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
hostname_tag
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
hostname_tag
);
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
clientname_tag
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
clientname_tag
);
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
clientname
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
clientname
);
mainGame
->
dInfo
.
isTag
=
true
;
mainGame
->
dInfo
.
isTag
=
true
;
mainGame
->
dInfo
.
tag_player
[
0
]
=
false
;
mainGame
->
dInfo
.
tag_player
[
0
]
=
false
;
mainGame
->
dInfo
.
tag_player
[
1
]
=
false
;
mainGame
->
dInfo
.
tag_player
[
1
]
=
false
;
}
else
{
}
else
{
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
hostname
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
hostname
);
cur_replay
.
Read
Data
(
mainGame
->
dInfo
.
clientname
,
40
);
cur_replay
.
Read
Name
(
mainGame
->
dInfo
.
clientname
);
}
}
//set_card_reader((card_reader)DataManager::CardReader);
//set_card_reader((card_reader)DataManager::CardReader);
//set_message_handler((message_handler)MessageHandler);
//set_message_handler((message_handler)MessageHandler);
...
...
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