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
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
Commits
736da0ba
Commit
736da0ba
authored
Apr 06, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove mod sign
parent
be7c74f1
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
0 additions
and
21 deletions
+0
-21
gframe/duelclient.cpp
gframe/duelclient.cpp
+0
-10
gframe/duelclient.h
gframe/duelclient.h
+0
-1
gframe/event_handler.cpp
gframe/event_handler.cpp
+0
-1
gframe/game.cpp
gframe/game.cpp
+0
-5
gframe/game.h
gframe/game.h
+0
-1
gframe/single_duel.cpp
gframe/single_duel.cpp
+0
-1
gframe/sound_manager.h
gframe/sound_manager.h
+0
-1
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+0
-1
No files found.
gframe/duelclient.cpp
View file @
736da0ba
...
@@ -32,7 +32,6 @@ int DuelClient::match_kill = 0;
...
@@ -32,7 +32,6 @@ int DuelClient::match_kill = 0;
std
::
vector
<
HostPacket
>
DuelClient
::
hosts
;
std
::
vector
<
HostPacket
>
DuelClient
::
hosts
;
std
::
set
<
unsigned
int
>
DuelClient
::
remotes
;
std
::
set
<
unsigned
int
>
DuelClient
::
remotes
;
event
*
DuelClient
::
resp_event
=
0
;
event
*
DuelClient
::
resp_event
=
0
;
//modded
unsigned
int
DuelClient
::
temp_ip
=
0
;
unsigned
int
DuelClient
::
temp_ip
=
0
;
unsigned
short
DuelClient
::
temp_port
=
0
;
unsigned
short
DuelClient
::
temp_port
=
0
;
unsigned
short
DuelClient
::
temp_ver
=
0
;
unsigned
short
DuelClient
::
temp_ver
=
0
;
...
@@ -51,7 +50,6 @@ bool DuelClient::StartClient(unsigned int ip, unsigned short port, bool create_g
...
@@ -51,7 +50,6 @@ bool DuelClient::StartClient(unsigned int ip, unsigned short port, bool create_g
sin
.
sin_port
=
htons
(
port
);
sin
.
sin_port
=
htons
(
port
);
client_bev
=
bufferevent_socket_new
(
client_base
,
-
1
,
BEV_OPT_CLOSE_ON_FREE
);
client_bev
=
bufferevent_socket_new
(
client_base
,
-
1
,
BEV_OPT_CLOSE_ON_FREE
);
bufferevent_setcb
(
client_bev
,
ClientRead
,
NULL
,
ClientEvent
,
(
void
*
)
create_game
);
bufferevent_setcb
(
client_bev
,
ClientRead
,
NULL
,
ClientEvent
,
(
void
*
)
create_game
);
//modded
temp_ip
=
ip
;
temp_ip
=
ip
;
temp_port
=
port
;
temp_port
=
port
;
...
@@ -76,7 +74,6 @@ void DuelClient::ConnectTimeout(evutil_socket_t fd, short events, void* arg) {
...
@@ -76,7 +74,6 @@ void DuelClient::ConnectTimeout(evutil_socket_t fd, short events, void* arg) {
if
(
connect_state
==
0x7
)
if
(
connect_state
==
0x7
)
return
;
return
;
if
(
!
is_closing
)
{
if
(
!
is_closing
)
{
//modded
temp_ver
=
0
;
temp_ver
=
0
;
mainGame
->
btnCreateHost
->
setEnabled
(
true
);
mainGame
->
btnCreateHost
->
setEnabled
(
true
);
mainGame
->
btnJoinHost
->
setEnabled
(
true
);
mainGame
->
btnJoinHost
->
setEnabled
(
true
);
...
@@ -172,7 +169,6 @@ void DuelClient::ClientEvent(bufferevent *bev, short events, void *ctx) {
...
@@ -172,7 +169,6 @@ void DuelClient::ClientEvent(bufferevent *bev, short events, void *ctx) {
bufferevent_disable
(
bev
,
EV_READ
);
bufferevent_disable
(
bev
,
EV_READ
);
if
(
!
is_closing
)
{
if
(
!
is_closing
)
{
if
(
connect_state
==
0x1
)
{
if
(
connect_state
==
0x1
)
{
//modded
temp_ver
=
0
;
temp_ver
=
0
;
mainGame
->
btnCreateHost
->
setEnabled
(
true
);
mainGame
->
btnCreateHost
->
setEnabled
(
true
);
mainGame
->
btnJoinHost
->
setEnabled
(
true
);
mainGame
->
btnJoinHost
->
setEnabled
(
true
);
...
@@ -257,7 +253,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
...
@@ -257,7 +253,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
STOC_ErrorMsg
*
pkt
=
(
STOC_ErrorMsg
*
)
pdata
;
STOC_ErrorMsg
*
pkt
=
(
STOC_ErrorMsg
*
)
pdata
;
switch
(
pkt
->
msg
)
{
switch
(
pkt
->
msg
)
{
case
ERRMSG_JOINERROR
:
{
case
ERRMSG_JOINERROR
:
{
//modded
temp_ver
=
0
;
temp_ver
=
0
;
mainGame
->
btnCreateHost
->
setEnabled
(
true
);
mainGame
->
btnCreateHost
->
setEnabled
(
true
);
mainGame
->
btnJoinHost
->
setEnabled
(
true
);
mainGame
->
btnJoinHost
->
setEnabled
(
true
);
...
@@ -336,7 +331,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
...
@@ -336,7 +331,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
mainGame
->
gMutex
.
Unlock
();
mainGame
->
gMutex
.
Unlock
();
break
;
break
;
}
}
//modded
case
ERRMSG_VERERROR
:
{
case
ERRMSG_VERERROR
:
{
if
(
temp_ver
)
{
if
(
temp_ver
)
{
temp_ver
=
0
;
temp_ver
=
0
;
...
@@ -430,7 +424,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
...
@@ -430,7 +424,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
break
;
break
;
}
}
case
STOC_JOIN_GAME
:
{
case
STOC_JOIN_GAME
:
{
//modded
temp_ver
=
0
;
temp_ver
=
0
;
STOC_JoinGame
*
pkt
=
(
STOC_JoinGame
*
)
pdata
;
STOC_JoinGame
*
pkt
=
(
STOC_JoinGame
*
)
pdata
;
std
::
wstring
str
;
std
::
wstring
str
;
...
@@ -1025,7 +1018,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
...
@@ -1025,7 +1018,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame
->
WaitFrameSignal
(
30
);
mainGame
->
WaitFrameSignal
(
30
);
break
;
break
;
}
}
//modded
//playing custom bgm
//playing custom bgm
case
HINT_MUSIC
:
{
case
HINT_MUSIC
:
{
char
BGMName
[
1024
];
char
BGMName
[
1024
];
...
@@ -1140,7 +1132,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
...
@@ -1140,7 +1132,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame
->
dField
.
Initial
(
mainGame
->
LocalPlayer
(
1
),
deckc
,
extrac
);
mainGame
->
dField
.
Initial
(
mainGame
->
LocalPlayer
(
1
),
deckc
,
extrac
);
mainGame
->
dInfo
.
turn
=
0
;
mainGame
->
dInfo
.
turn
=
0
;
mainGame
->
dInfo
.
is_shuffling
=
false
;
mainGame
->
dInfo
.
is_shuffling
=
false
;
//modded - to check swapped
mainGame
->
dInfo
.
is_swapped
=
false
;
mainGame
->
dInfo
.
is_swapped
=
false
;
if
(
mainGame
->
dInfo
.
isReplaySwapped
)
{
if
(
mainGame
->
dInfo
.
isReplaySwapped
)
{
std
::
swap
(
mainGame
->
dInfo
.
hostname
,
mainGame
->
dInfo
.
clientname
);
std
::
swap
(
mainGame
->
dInfo
.
hostname
,
mainGame
->
dInfo
.
clientname
);
...
@@ -3960,7 +3951,6 @@ void DuelClient::BroadcastReply(evutil_socket_t fd, short events, void * arg) {
...
@@ -3960,7 +3951,6 @@ void DuelClient::BroadcastReply(evutil_socket_t fd, short events, void * arg) {
/*int ret = */
recvfrom
(
fd
,
buf
,
256
,
0
,
(
sockaddr
*
)
&
bc_addr
,
&
sz
);
/*int ret = */
recvfrom
(
fd
,
buf
,
256
,
0
,
(
sockaddr
*
)
&
bc_addr
,
&
sz
);
unsigned
int
ipaddr
=
bc_addr
.
sin_addr
.
s_addr
;
unsigned
int
ipaddr
=
bc_addr
.
sin_addr
.
s_addr
;
HostPacket
*
pHP
=
(
HostPacket
*
)
buf
;
HostPacket
*
pHP
=
(
HostPacket
*
)
buf
;
//modded
if
(
!
is_closing
&&
pHP
->
identifier
==
NETWORK_SERVER_ID
&&
remotes
.
find
(
ipaddr
)
==
remotes
.
end
()
)
{
if
(
!
is_closing
&&
pHP
->
identifier
==
NETWORK_SERVER_ID
&&
remotes
.
find
(
ipaddr
)
==
remotes
.
end
()
)
{
mainGame
->
gMutex
.
Lock
();
mainGame
->
gMutex
.
Lock
();
remotes
.
insert
(
ipaddr
);
remotes
.
insert
(
ipaddr
);
...
...
gframe/duelclient.h
View file @
736da0ba
...
@@ -33,7 +33,6 @@ private:
...
@@ -33,7 +33,6 @@ private:
static
wchar_t
event_string
[
256
];
static
wchar_t
event_string
[
256
];
static
mtrandom
rnd
;
static
mtrandom
rnd
;
public:
public:
//modded
static
unsigned
int
temp_ip
;
static
unsigned
int
temp_ip
;
static
unsigned
short
temp_port
;
static
unsigned
short
temp_port
;
static
unsigned
short
temp_ver
;
static
unsigned
short
temp_ver
;
...
...
gframe/event_handler.cpp
View file @
736da0ba
...
@@ -1800,7 +1800,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
...
@@ -1800,7 +1800,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
return
true
;
return
true
;
break
;
break
;
}
}
//modded
case
CHECKBOX_ENABLE_SOUND
:
{
case
CHECKBOX_ENABLE_SOUND
:
{
if
(
!
mainGame
->
chkEnableSound
->
isChecked
())
if
(
!
mainGame
->
chkEnableSound
->
isChecked
())
soundManager
.
StopSound
();
soundManager
.
StopSound
();
...
...
gframe/game.cpp
View file @
736da0ba
...
@@ -70,7 +70,6 @@ bool Game::Initialize() {
...
@@ -70,7 +70,6 @@ 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"KoishiPro"
);
device
->
setWindowCaption
(
L"KoishiPro"
);
device
->
setResizable
(
true
);
device
->
setResizable
(
true
);
if
(
gameConf
.
window_maximized
)
if
(
gameConf
.
window_maximized
)
...
@@ -91,7 +90,6 @@ bool Game::Initialize() {
...
@@ -91,7 +90,6 @@ bool Game::Initialize() {
SetWindowsIcon
();
SetWindowsIcon
();
//main menu
//main menu
wchar_t
strbuf
[
256
];
wchar_t
strbuf
[
256
];
//modded
myswprintf
(
strbuf
,
L"KoishiPro Version:%X.0%X.%X"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
myswprintf
(
strbuf
,
L"KoishiPro 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
);
...
@@ -777,7 +775,6 @@ void Game::MainLoop() {
...
@@ -777,7 +775,6 @@ void Game::MainLoop() {
usleep
(
20000
);
usleep
(
20000
);
#endif
#endif
if
(
cur_time
>=
1000
)
{
if
(
cur_time
>=
1000
)
{
//modded
myswprintf
(
cap
,
L"KoishiPro FPS: %d"
,
fps
);
myswprintf
(
cap
,
L"KoishiPro FPS: %d"
,
fps
);
device
->
setWindowCaption
(
cap
);
device
->
setWindowCaption
(
cap
);
fps
=
0
;
fps
=
0
;
...
@@ -789,7 +786,6 @@ void Game::MainLoop() {
...
@@ -789,7 +786,6 @@ void Game::MainLoop() {
RefreshTimeDisplay
();
RefreshTimeDisplay
();
}
}
}
}
//modded
if
(
DuelClient
::
try_needed
)
{
if
(
DuelClient
::
try_needed
)
{
DuelClient
::
try_needed
=
false
;
DuelClient
::
try_needed
=
false
;
DuelClient
::
StartClient
(
DuelClient
::
temp_ip
,
DuelClient
::
temp_port
,
false
);
DuelClient
::
StartClient
(
DuelClient
::
temp_ip
,
DuelClient
::
temp_port
,
false
);
...
@@ -1431,7 +1427,6 @@ void Game::ShowCardInfo(int code, bool resize) {
...
@@ -1431,7 +1427,6 @@ void Game::ShowCardInfo(int code, bool resize) {
wcscat
(
formatBuffer
,
scaleBuffer
);
wcscat
(
formatBuffer
,
scaleBuffer
);
}
}
stDataInfo
->
setText
(
formatBuffer
);
stDataInfo
->
setText
(
formatBuffer
);
//modded
if
((
cd
.
type
&
TYPE_LINK
)
&&
(
cd
.
level
>
5
))
{
if
((
cd
.
type
&
TYPE_LINK
)
&&
(
cd
.
level
>
5
))
{
stDataInfo
->
setRelativePosition
(
rect
<
s32
>
(
15
,
60
,
296
,
98
));
stDataInfo
->
setRelativePosition
(
rect
<
s32
>
(
15
,
60
,
296
,
98
));
stSetName
->
setRelativePosition
(
rect
<
s32
>
(
15
,
98
,
296
*
xScale
,
121
));
stSetName
->
setRelativePosition
(
rect
<
s32
>
(
15
,
98
,
296
*
xScale
,
121
));
...
...
gframe/game.h
View file @
736da0ba
...
@@ -62,7 +62,6 @@ struct DuelInfo {
...
@@ -62,7 +62,6 @@ struct DuelInfo {
bool
isTag
;
bool
isTag
;
bool
isSingleMode
;
bool
isSingleMode
;
bool
is_shuffling
;
bool
is_shuffling
;
//modded - to check swapped
bool
is_swapped
;
bool
is_swapped
;
bool
tag_player
[
2
];
bool
tag_player
[
2
];
int
lp
[
2
];
int
lp
[
2
];
...
...
gframe/single_duel.cpp
View file @
736da0ba
...
@@ -588,7 +588,6 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
...
@@ -588,7 +588,6 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
NetServer
::
ReSendToPlayer
(
*
oit
);
NetServer
::
ReSendToPlayer
(
*
oit
);
break
;
break
;
}
}
//modded
case
10
:
case
10
:
case
11
:
case
11
:
case
12
:
case
12
:
...
...
gframe/sound_manager.h
View file @
736da0ba
...
@@ -79,7 +79,6 @@ extern SoundManager soundManager;
...
@@ -79,7 +79,6 @@ extern SoundManager soundManager;
#define BGM_DISADVANTAGE 5
#define BGM_DISADVANTAGE 5
#define BGM_WIN 6
#define BGM_WIN 6
#define BGM_LOSE 7
#define BGM_LOSE 7
//modded
#define BGM_CUSTOM 8
#define BGM_CUSTOM 8
}
}
...
...
gframe/tag_duel.cpp
View file @
736da0ba
...
@@ -537,7 +537,6 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
...
@@ -537,7 +537,6 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
NetServer
::
ReSendToPlayer
(
*
oit
);
NetServer
::
ReSendToPlayer
(
*
oit
);
break
;
break
;
}
}
//modded
case
11
:
case
11
:
case
12
:
case
12
:
case
13
:
{
case
13
:
{
...
...
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