Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Games
KsirK
Commits
1b425561
Commit
1b425561
authored
Mar 22, 2007
by
Dirk Mueller
Browse files
pedantic
svn path=/trunk/playground/games/ksirk/; revision=645378
parent
d13c1c04
Changes
17
Hide whitespace changes
Inline
Side-by-side
ksirk/GameLogic/KsirkChatItem.h
View file @
1b425561
...
...
@@ -71,6 +71,6 @@ private:
QList
<
QString
>
m_strings
;
QList
<
ElemType
>
m_order
;
}
;
// class KsirkChatItem
Q_DECLARE_METATYPE
(
KsirkChatItem
)
;
Q_DECLARE_METATYPE
(
KsirkChatItem
)
#endif // KSIRKCHATITEM_H
ksirk/GameLogic/gameautomaton.cpp
View file @
1b425561
...
...
@@ -1012,7 +1012,7 @@ QDataStream& operator>>(QDataStream& s, GameAutomaton::GameState& state)
s
>>
istate
;
state
=
GameAutomaton
::
GameState
(
istate
);
return
s
;
}
;
}
bool
GameAutomaton
::
setupPlayersNumberAndSkin
(
bool
&
networkGame
,
int
&
port
,
uint
&
newPlayersNumber
)
...
...
@@ -2227,7 +2227,7 @@ void GameAutomaton::explosionFinished()
}
}
}
;
// closing namespace GameLogic
}
;
// closing namespace Ksirk
}
// closing namespace GameLogic
}
// closing namespace Ksirk
#include
"gameautomaton.moc"
ksirk/GameLogic/gameautomaton.h
View file @
1b425561
...
...
@@ -97,7 +97,7 @@ enum KsirkMessagesIds {
Winner
,
// 305
NbPlayers
,
// 306
FinalizePlayers
,
// 307
Acknowledge
,
// 308
Acknowledge
// 308
};
/** Messages formats:
...
...
ksirk/GameLogic/goal.h
View file @
1b425561
...
...
@@ -46,7 +46,7 @@ public:
NoGoal
,
/**< The goal is to conquer all the world. */
GoalPlayer
,
/**< The goal is to eliminate one player. */
Countries
,
/**< The goal is to conquier a given number of countries. */
Continents
,
/**< The goal is to conquier a few continents. */
Continents
/**< The goal is to conquier a few continents. */
};
...
...
ksirk/GameLogic/player.cpp
View file @
1b425561
...
...
@@ -73,7 +73,7 @@ Player::Player(
bool
Player
::
operator
==
(
const
Player
&
player
)
const
{
return
(
name
()
==
player
.
name
());
}
;
}
/** */
...
...
ksirk/Sprites/animsprite.cpp
View file @
1b425561
...
...
@@ -95,7 +95,7 @@ AnimSprite::~AnimSprite()
void
AnimSprite
::
repaint
()
{
update
();
}
;
}
void
AnimSprite
::
setLook
(
TDir
newLook
)
{
...
...
ksirk/Sprites/backgnd.cpp
View file @
1b425561
...
...
@@ -35,12 +35,12 @@ BackGnd::BackGnd(QGraphicsScene *scene, const GameLogic::ONU* theWorld) :
setPixmap
(
theWorld
->
map
());
setZValue
(
1
);
show
();
}
;
}
BackGnd
::~
BackGnd
()
{
// m_frame = 0;
}
;
}
...
...
ksirk/Sprites/cannonsprite.cpp
View file @
1b425561
...
...
@@ -45,4 +45,4 @@ void CannonSprite::setupTravel(
}
}
}
;
}
ksirk/Sprites/cavalrysprite.cpp
View file @
1b425561
...
...
@@ -51,4 +51,4 @@ void CavalrySprite::setupTravel(
}
}
;
}
ksirk/Sprites/cavalrysprite.h
View file @
1b425561
...
...
@@ -75,6 +75,6 @@ private:
static
const
unsigned
int
m_nbArmies
=
5
;
};
}
;
}
#endif
ksirk/Sprites/flagsprite.h
View file @
1b425561
...
...
@@ -57,6 +57,6 @@ public:
virtual
~
FlagSprite
()
{}
};
}
;
}
#endif
ksirk/Sprites/infantrysprite.cpp
View file @
1b425561
...
...
@@ -50,4 +50,4 @@ void InfantrySprite::setupTravel(
}
}
}
;
}
ksirk/Sprites/infantrysprite.h
View file @
1b425561
...
...
@@ -76,6 +76,6 @@ private:
static
const
unsigned
int
m_nbArmies
=
1
;
};
}
;
}
#endif
ksirk/Sprites/skinSpritesData.cpp
View file @
1b425561
...
...
@@ -115,5 +115,5 @@ void SkinSpritesData::intData(const QString& name, int data)
}
}
;
// closing namespace GameLogic
}
;
// closing namespace Ksirk
}
// closing namespace GameLogic
}
// closing namespace Ksirk
ksirk/Sprites/skinSpritesData.h
View file @
1b425561
...
...
@@ -106,7 +106,7 @@ private:
std
::
map
<
QString
,
QString
>
m_strDatas
;
};
}
;
// closing namespace Sprites
}
;
// closing namespace Ksirk
}
// closing namespace Sprites
}
// closing namespace Ksirk
#endif // KSIRK_SPRITES_SKINSPRITESDATA_H
ksirk/kgamewin.cpp
View file @
1b425561
...
...
@@ -310,7 +310,7 @@ void KGameWindow::newSkin(const QString& onuFileName)
// toolBar("mainToolBar")-> setBarPos(KToolBar::Bottom);
// toolBar("gameActionsToolBar")-> setBarPos(KToolBar::Bottom);
m_frame
->
setFocus
();
}
;
}
void
KGameWindow
::
initView
()
{
...
...
ksirk/kgamewinslots.cpp
View file @
1b425561
...
...
@@ -161,7 +161,7 @@ void KGameWindow::evenementTimer()
// kDebug() << "restarting timer" << endl;
m_timer
.
start
(
200
);
}
}
;
}
void
KGameWindow
::
slotLeftButtonDown
(
const
QPointF
&
point
)
{
...
...
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