Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-core
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-core
Commits
6113e3d3
Commit
6113e3d3
authored
Dec 19, 2015
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update AnnounceCard
parent
ea2ad25d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
field.h
field.h
+1
-1
libduel.cpp
libduel.cpp
+4
-1
playerop.cpp
playerop.cpp
+2
-1
processor.cpp
processor.cpp
+1
-1
No files found.
field.h
View file @
6113e3d3
...
@@ -531,7 +531,7 @@ public:
...
@@ -531,7 +531,7 @@ public:
int32
sort_card
(
int16
step
,
uint8
playerid
,
uint8
is_chain
);
int32
sort_card
(
int16
step
,
uint8
playerid
,
uint8
is_chain
);
int32
announce_race
(
int16
step
,
uint8
playerid
,
int32
count
,
int32
available
);
int32
announce_race
(
int16
step
,
uint8
playerid
,
int32
count
,
int32
available
);
int32
announce_attribute
(
int16
step
,
uint8
playerid
,
int32
count
,
int32
available
);
int32
announce_attribute
(
int16
step
,
uint8
playerid
,
int32
count
,
int32
available
);
int32
announce_card
(
int16
step
,
uint8
playerid
);
int32
announce_card
(
int16
step
,
uint8
playerid
,
uint32
ttype
);
int32
announce_number
(
int16
step
,
uint8
playerid
);
int32
announce_number
(
int16
step
,
uint8
playerid
);
};
};
...
...
libduel.cpp
View file @
6113e3d3
...
@@ -2702,7 +2702,10 @@ int32 scriptlib::duel_announce_card(lua_State * L) {
...
@@ -2702,7 +2702,10 @@ int32 scriptlib::duel_announce_card(lua_State * L) {
check_param_count
(
L
,
1
);
check_param_count
(
L
,
1
);
int32
playerid
=
lua_tointeger
(
L
,
1
);
int32
playerid
=
lua_tointeger
(
L
,
1
);
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
pduel
->
game_field
->
add_process
(
PROCESSOR_ANNOUNCE_CARD
,
0
,
0
,
0
,
playerid
,
0
);
uint32
ttype
=
TYPE_MONSTER
|
TYPE_SPELL
|
TYPE_TRAP
;
if
(
lua_gettop
(
L
)
>=
2
)
ttype
=
lua_tointeger
(
L
,
2
);
pduel
->
game_field
->
add_process
(
PROCESSOR_ANNOUNCE_CARD
,
0
,
0
,
0
,
playerid
,
ttype
);
return
lua_yield
(
L
,
0
);
return
lua_yield
(
L
,
0
);
}
}
int32
scriptlib
::
duel_announce_type
(
lua_State
*
L
)
{
int32
scriptlib
::
duel_announce_type
(
lua_State
*
L
)
{
...
...
playerop.cpp
View file @
6113e3d3
...
@@ -731,10 +731,11 @@ int32 field::announce_attribute(int16 step, uint8 playerid, int32 count, int32 a
...
@@ -731,10 +731,11 @@ int32 field::announce_attribute(int16 step, uint8 playerid, int32 count, int32 a
}
}
return
TRUE
;
return
TRUE
;
}
}
int32
field
::
announce_card
(
int16
step
,
uint8
playerid
)
{
int32
field
::
announce_card
(
int16
step
,
uint8
playerid
,
uint32
ttype
)
{
if
(
step
==
0
)
{
if
(
step
==
0
)
{
pduel
->
write_buffer8
(
MSG_ANNOUNCE_CARD
);
pduel
->
write_buffer8
(
MSG_ANNOUNCE_CARD
);
pduel
->
write_buffer8
(
playerid
);
pduel
->
write_buffer8
(
playerid
);
pduel
->
write_buffer32
(
ttype
);
return
FALSE
;
return
FALSE
;
}
else
{
}
else
{
pduel
->
write_buffer8
(
MSG_HINT
);
pduel
->
write_buffer8
(
MSG_HINT
);
...
...
processor.cpp
View file @
6113e3d3
...
@@ -569,7 +569,7 @@ int32 field::process() {
...
@@ -569,7 +569,7 @@ int32 field::process() {
return
PROCESSOR_WAITING
+
pduel
->
bufferlen
;
return
PROCESSOR_WAITING
+
pduel
->
bufferlen
;
}
}
case
PROCESSOR_ANNOUNCE_CARD
:
{
case
PROCESSOR_ANNOUNCE_CARD
:
{
if
(
announce_card
(
it
->
step
,
it
->
arg1
))
{
if
(
announce_card
(
it
->
step
,
it
->
arg1
,
it
->
arg2
))
{
pduel
->
lua
->
add_param
(
returns
.
ivalue
[
0
],
PARAM_TYPE_INT
);
pduel
->
lua
->
add_param
(
returns
.
ivalue
[
0
],
PARAM_TYPE_INT
);
core
.
units
.
pop_front
();
core
.
units
.
pop_front
();
}
else
{
}
else
{
...
...
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