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
9783f9e7
Commit
9783f9e7
authored
Sep 27, 2015
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
9240b001
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
gframe/event_handler.cpp
gframe/event_handler.cpp
+2
-2
gframe/game.h
gframe/game.h
+5
-0
ocgcore
ocgcore
+1
-1
script
script
+1
-1
No files found.
gframe/event_handler.cpp
View file @
9783f9e7
...
...
@@ -1577,7 +1577,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
break
;
}
case
irr
:
:
KEY_KEY_R
:
{
if
(
!
event
.
KeyInput
.
PressedDown
&&
!
mainGame
->
env
->
hasFocus
(
mainGame
->
ebChatInput
))
if
(
!
event
.
KeyInput
.
PressedDown
&&
!
mainGame
->
HasFocus
(
EGUIET_EDIT_BOX
))
mainGame
->
textFont
->
setTransparency
(
true
);
break
;
}
...
...
@@ -1588,7 +1588,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case
irr
:
:
KEY_F6
:
case
irr
:
:
KEY_F7
:
{
if
(
!
event
.
KeyInput
.
PressedDown
&&
!
mainGame
->
dInfo
.
isReplay
&&
mainGame
->
dInfo
.
player_type
!=
7
&&
mainGame
->
dInfo
.
isStarted
&&
!
mainGame
->
wCardDisplay
->
isVisible
()
&&
!
mainGame
->
env
->
hasFocus
(
mainGame
->
ebChatInput
))
{
&&
!
mainGame
->
wCardDisplay
->
isVisible
()
&&
!
mainGame
->
HasFocus
(
EGUIET_EDIT_BOX
))
{
int
loc_id
=
0
;
display_cards
.
clear
();
switch
(
event
.
KeyInput
.
Key
)
{
...
...
gframe/game.h
View file @
9783f9e7
...
...
@@ -97,6 +97,11 @@ public:
int
LocalPlayer
(
int
player
);
const
wchar_t
*
LocalName
(
int
local_player
);
bool
HasFocus
(
EGUI_ELEMENT_TYPE
type
)
const
{
irr
::
gui
::
IGUIElement
*
focus
=
env
->
getFocus
();
return
focus
&&
focus
->
hasType
(
type
);
}
Mutex
gMutex
;
Mutex
gBuffer
;
Signal
frameSignal
;
...
...
ocgcore
@
f7089e78
Subproject commit
e8420f07388d2f47adab11ba8d3fd5d3462837dd
Subproject commit
f7089e78827fea0aebc245639b27f59f76f5f35f
script
@
741b50f0
Subproject commit
6324c1c9b481348acba68f704da3ff6bea2f65d6
Subproject commit
741b50f028be514a8a9ab950836e3cbf74c5875e
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