Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
69a9484e
Commit
69a9484e
authored
Apr 17, 2015
by
woogerboy21
Browse files
Merge pull request #981 from ctrlaltca/servatrice_compilation_fix
Quick compilation fix for debug mode
parents
1562d1ef
3d0b132d
Changes
4
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/arrowitem.cpp
View file @
69a9484e
...
@@ -216,8 +216,6 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
...
@@ -216,8 +216,6 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
cmd
.
set_start_card_id
(
startCard
->
getId
());
cmd
.
set_start_card_id
(
startCard
->
getId
());
if
(
targetCard
)
{
if
(
targetCard
)
{
CardZone
*
startZone
=
startCard
->
getZone
();
CardZone
*
targetZone
=
targetCard
->
getZone
();
CardZone
*
targetZone
=
targetCard
->
getZone
();
cmd
.
set_target_player_id
(
targetZone
->
getPlayer
()
->
getId
());
cmd
.
set_target_player_id
(
targetZone
->
getPlayer
()
->
getId
());
cmd
.
set_target_zone
(
targetZone
->
getName
().
toStdString
());
cmd
.
set_target_zone
(
targetZone
->
getName
().
toStdString
());
...
...
cockatrice/src/tab_deck_editor.cpp
View file @
69a9484e
...
@@ -698,7 +698,7 @@ void TabDeckEditor::actDecrement()
...
@@ -698,7 +698,7 @@ void TabDeckEditor::actDecrement()
offsetCountAtIndex
(
currentIndex
,
-
1
);
offsetCountAtIndex
(
currentIndex
,
-
1
);
}
}
void
TabDeckEditor
::
setPriceTagFeatureEnabled
(
int
enabled
)
void
TabDeckEditor
::
setPriceTagFeatureEnabled
(
int
/*
enabled
*/
)
{
{
//aUpdatePrices->setVisible(enabled);
//aUpdatePrices->setVisible(enabled);
deckModel
->
pricesUpdated
();
deckModel
->
pricesUpdated
();
...
...
cockatrice/src/zoneviewwidget.cpp
View file @
69a9484e
...
@@ -57,7 +57,7 @@ void TitleLabel::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
...
@@ -57,7 +57,7 @@ void TitleLabel::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
}
ZoneViewWidget
::
ZoneViewWidget
(
Player
*
_player
,
CardZone
*
_origZone
,
int
numberCards
,
bool
_revealZone
,
bool
_writeableRevealZone
,
const
QList
<
const
ServerInfo_Card
*>
&
cardList
)
ZoneViewWidget
::
ZoneViewWidget
(
Player
*
_player
,
CardZone
*
_origZone
,
int
numberCards
,
bool
_revealZone
,
bool
_writeableRevealZone
,
const
QList
<
const
ServerInfo_Card
*>
&
cardList
)
:
QGraphicsWidget
(
0
,
Qt
::
Tool
|
Qt
::
FramelessWindowHint
),
player
(
_player
),
canBeShuffled
(
_origZone
->
getIsShufflable
())
:
QGraphicsWidget
(
0
,
Qt
::
Tool
|
Qt
::
FramelessWindowHint
),
canBeShuffled
(
_origZone
->
getIsShufflable
())
,
player
(
_player
)
{
{
setAcceptHoverEvents
(
true
);
setAcceptHoverEvents
(
true
);
setAttribute
(
Qt
::
WA_DeleteOnClose
);
setAttribute
(
Qt
::
WA_DeleteOnClose
);
...
...
common/server_database_interface.h
View file @
69a9484e
...
@@ -37,7 +37,7 @@ public:
...
@@ -37,7 +37,7 @@ public:
virtual
bool
getRequireRegistration
()
{
return
false
;
}
virtual
bool
getRequireRegistration
()
{
return
false
;
}
enum
LogMessage_TargetType
{
MessageTargetRoom
,
MessageTargetGame
,
MessageTargetChat
,
MessageTargetIslRoom
};
enum
LogMessage_TargetType
{
MessageTargetRoom
,
MessageTargetGame
,
MessageTargetChat
,
MessageTargetIslRoom
};
virtual
void
logMessage
(
const
int
senderId
,
const
QString
&
senderName
,
const
QString
&
senderIp
,
const
QString
&
logMessage
,
LogMessage_TargetType
targetType
,
const
int
targetId
,
const
QString
&
targetName
)
{
};
virtual
void
logMessage
(
const
int
/*
senderId
*/
,
const
QString
&
/*
senderName
*/
,
const
QString
&
/*
senderIp
*/
,
const
QString
&
/*
logMessage
*/
,
LogMessage_TargetType
/*
targetType
*/
,
const
int
/*
targetId
*/
,
const
QString
&
/*
targetName
*/
)
{
};
};
};
#endif
#endif
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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