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
673e09d5
Commit
673e09d5
authored
Sep 09, 2014
by
Argon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix crash
parent
75efd24b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
gframe/duelclient.cpp
gframe/duelclient.cpp
+3
-2
gframe/game.cpp
gframe/game.cpp
+1
-1
gframe/replay_mode.cpp
gframe/replay_mode.cpp
+1
-1
gframe/single_duel.cpp
gframe/single_duel.cpp
+1
-1
gframe/single_mode.cpp
gframe/single_mode.cpp
+1
-1
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+1
-1
ocgcore/playerop.cpp
ocgcore/playerop.cpp
+1
-3
script/c71645242.lua
script/c71645242.lua
+2
-1
No files found.
gframe/duelclient.cpp
View file @
673e09d5
...
@@ -1150,7 +1150,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
...
@@ -1150,7 +1150,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
int
forced
=
BufferIO
::
ReadInt8
(
pbuf
);
int
forced
=
BufferIO
::
ReadInt8
(
pbuf
);
/*int hint0 = */
BufferIO
::
ReadInt32
(
pbuf
);
/*int hint0 = */
BufferIO
::
ReadInt32
(
pbuf
);
/*int hint1 = */
BufferIO
::
ReadInt32
(
pbuf
);
/*int hint1 = */
BufferIO
::
ReadInt32
(
pbuf
);
int
c
,
l
,
s
/*, code*/
,
desc
;
int
c
,
l
,
s
,
ss
,
desc
;
ClientCard
*
pcard
;
ClientCard
*
pcard
;
mainGame
->
dField
.
chain_forced
=
(
forced
!=
0
);
mainGame
->
dField
.
chain_forced
=
(
forced
!=
0
);
mainGame
->
dField
.
activatable_cards
.
clear
();
mainGame
->
dField
.
activatable_cards
.
clear
();
...
@@ -1160,8 +1160,9 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
...
@@ -1160,8 +1160,9 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
c
=
mainGame
->
LocalPlayer
(
BufferIO
::
ReadInt8
(
pbuf
));
c
=
mainGame
->
LocalPlayer
(
BufferIO
::
ReadInt8
(
pbuf
));
l
=
BufferIO
::
ReadInt8
(
pbuf
);
l
=
BufferIO
::
ReadInt8
(
pbuf
);
s
=
BufferIO
::
ReadInt8
(
pbuf
);
s
=
BufferIO
::
ReadInt8
(
pbuf
);
ss
=
BufferIO
::
ReadInt8
(
pbuf
);
desc
=
BufferIO
::
ReadInt32
(
pbuf
);
desc
=
BufferIO
::
ReadInt32
(
pbuf
);
pcard
=
mainGame
->
dField
.
GetCard
(
c
,
l
,
s
);
pcard
=
mainGame
->
dField
.
GetCard
(
c
,
l
,
s
,
ss
);
mainGame
->
dField
.
activatable_cards
.
push_back
(
pcard
);
mainGame
->
dField
.
activatable_cards
.
push_back
(
pcard
);
mainGame
->
dField
.
activatable_descs
.
push_back
(
desc
);
mainGame
->
dField
.
activatable_descs
.
push_back
(
desc
);
pcard
->
is_selectable
=
true
;
pcard
->
is_selectable
=
true
;
...
...
gframe/game.cpp
View file @
673e09d5
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#include <dirent.h>
#include <dirent.h>
#endif
#endif
const
unsigned
short
PRO_VERSION
=
0x133
1
;
const
unsigned
short
PRO_VERSION
=
0x133
2
;
namespace
ygo
{
namespace
ygo
{
...
...
gframe/replay_mode.cpp
View file @
673e09d5
...
@@ -281,7 +281,7 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
...
@@ -281,7 +281,7 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
case
MSG_SELECT_CHAIN
:
{
case
MSG_SELECT_CHAIN
:
{
player
=
BufferIO
::
ReadInt8
(
pbuf
);
player
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
pbuf
+=
10
+
count
*
1
1
;
pbuf
+=
10
+
count
*
1
2
;
return
ReadReplayResponse
();
return
ReadReplayResponse
();
}
}
case
MSG_SELECT_PLACE
:
case
MSG_SELECT_PLACE
:
...
...
gframe/single_duel.cpp
View file @
673e09d5
...
@@ -692,7 +692,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
...
@@ -692,7 +692,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
case
MSG_SELECT_CHAIN
:
{
case
MSG_SELECT_CHAIN
:
{
player
=
BufferIO
::
ReadInt8
(
pbuf
);
player
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
pbuf
+=
10
+
count
*
1
1
;
pbuf
+=
10
+
count
*
1
2
;
WaitforResponse
(
player
);
WaitforResponse
(
player
);
NetServer
::
SendBufferToPlayer
(
players
[
player
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
NetServer
::
SendBufferToPlayer
(
players
[
player
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
return
1
;
return
1
;
...
...
gframe/single_mode.cpp
View file @
673e09d5
...
@@ -213,7 +213,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
...
@@ -213,7 +213,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
case
MSG_SELECT_CHAIN
:
{
case
MSG_SELECT_CHAIN
:
{
player
=
BufferIO
::
ReadInt8
(
pbuf
);
player
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
pbuf
+=
10
+
count
*
1
1
;
pbuf
+=
10
+
count
*
1
2
;
if
(
!
DuelClient
::
ClientAnalyze
(
offset
,
pbuf
-
offset
))
{
if
(
!
DuelClient
::
ClientAnalyze
(
offset
,
pbuf
-
offset
))
{
mainGame
->
singleSignal
.
Reset
();
mainGame
->
singleSignal
.
Reset
();
mainGame
->
singleSignal
.
Wait
();
mainGame
->
singleSignal
.
Wait
();
...
...
gframe/tag_duel.cpp
View file @
673e09d5
...
@@ -625,7 +625,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
...
@@ -625,7 +625,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
case
MSG_SELECT_CHAIN
:
{
case
MSG_SELECT_CHAIN
:
{
player
=
BufferIO
::
ReadInt8
(
pbuf
);
player
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
pbuf
+=
10
+
count
*
1
1
;
pbuf
+=
10
+
count
*
1
2
;
WaitforResponse
(
player
);
WaitforResponse
(
player
);
NetServer
::
SendBufferToPlayer
(
cur_player
[
player
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
NetServer
::
SendBufferToPlayer
(
cur_player
[
player
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
return
1
;
return
1
;
...
...
ocgcore/playerop.cpp
View file @
673e09d5
...
@@ -313,9 +313,7 @@ int32 field::select_chain(uint16 step, uint8 playerid, uint8 spe_count, uint8 fo
...
@@ -313,9 +313,7 @@ int32 field::select_chain(uint16 step, uint8 playerid, uint8 spe_count, uint8 fo
effect
*
peffect
=
core
.
select_chains
[
i
].
triggering_effect
;
effect
*
peffect
=
core
.
select_chains
[
i
].
triggering_effect
;
card
*
pcard
=
peffect
->
handler
;
card
*
pcard
=
peffect
->
handler
;
pduel
->
write_buffer32
(
pcard
->
data
.
code
);
pduel
->
write_buffer32
(
pcard
->
data
.
code
);
pduel
->
write_buffer8
(
pcard
->
current
.
controler
);
pduel
->
write_buffer32
(
pcard
->
get_info_location
());
pduel
->
write_buffer8
(
pcard
->
current
.
location
);
pduel
->
write_buffer8
(
pcard
->
current
.
sequence
);
pduel
->
write_buffer32
(
peffect
->
description
);
pduel
->
write_buffer32
(
peffect
->
description
);
}
}
return
FALSE
;
return
FALSE
;
...
...
script/c71645242.lua
View file @
673e09d5
...
@@ -99,7 +99,8 @@ function c71645242.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
...
@@ -99,7 +99,8 @@ function c71645242.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local
g
=
Duel
.
GetMatchingGroup
(
c71645242
.
desfilter
,
tp
,
LOCATION_MZONE
,
LOCATION_MZONE
,
nil
)
local
g
=
Duel
.
GetMatchingGroup
(
c71645242
.
desfilter
,
tp
,
LOCATION_MZONE
,
LOCATION_MZONE
,
nil
)
local
atk
=
g
:
GetSum
(
Card
.
GetAttack
)
local
atk
=
g
:
GetSum
(
Card
.
GetAttack
)
local
sc
=
g
:
FilterCount
(
Card
.
IsControler
,
nil
,
tp
)
local
sc
=
g
:
FilterCount
(
Card
.
IsControler
,
nil
,
tp
)
if
chk
==
0
then
return
e
:
GetHandler
():
IsDestructable
(
e
)
and
g
:
GetCount
()
>
0
and
(
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>-
sc
)
if
chk
==
0
then
return
e
:
GetHandler
():
IsDestructable
()
and
e
:
GetHandler
():
IsDestructable
(
e
)
and
g
:
GetCount
()
>
0
and
(
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>-
sc
)
and
Duel
.
IsExistingTarget
(
c71645242
.
filter2
,
tp
,
LOCATION_GRAVE
,
0
,
1
,
nil
,
atk
,
e
,
tp
)
end
and
Duel
.
IsExistingTarget
(
c71645242
.
filter2
,
tp
,
LOCATION_GRAVE
,
0
,
1
,
nil
,
atk
,
e
,
tp
)
end
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
local
tg
=
Duel
.
SelectTarget
(
tp
,
c71645242
.
filter2
,
tp
,
LOCATION_GRAVE
,
0
,
1
,
1
,
nil
,
atk
,
e
,
tp
)
local
tg
=
Duel
.
SelectTarget
(
tp
,
c71645242
.
filter2
,
tp
,
LOCATION_GRAVE
,
0
,
1
,
1
,
nil
,
atk
,
e
,
tp
)
...
...
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