[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/games/granatier/src
From: Mathias Kraus <k.hias () gmx ! de>
Date: 2009-10-07 23:50:28
Message-ID: 1254959428.779674.28447.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1032503 by mkraus:
add a checkbox to make it possible to show all items, even if the features for this \
items are not yet implemented. this will help the artist to do their work.
M +7 -1 game.cpp
M +39 -21 gamescene.cpp
M +36 -29 generalsettings.ui
M +4 -0 granatier.kcfg
--- trunk/playground/games/granatier/src/game.cpp #1032502:1032503
@@ -352,8 +352,14 @@
bonusType = Bonus::NONE;
if(i < nBonusCount)
{
- switch (static_cast <int> ((qrand()/1.0)/RAND_MAX * 3/*5*/))
+ int nNumberOfBonuses = 3;
+ if(Settings::self()->showAllTiles() == 1)
{
+ nNumberOfBonuses = 5;
+ }
+
+ switch (static_cast <int> ((qrand()/1.0)/RAND_MAX * nNumberOfBonuses))
+ {
case 0: bonusType = Bonus::SPEED;
break;
case 1: bonusType = Bonus::BOMB;
--- trunk/playground/games/granatier/src/gamescene.cpp #1032502:1032503
@@ -59,7 +59,7 @@
m_rendererSelectedTheme = new KSvgRenderer();
loadTheme();
- // set the renderer for the arena items
+ // set the renderer for the arena items TODO: add all the arena items
if(m_rendererSelectedTheme->elementExists("arena_ground") &&
m_rendererSelectedTheme->elementExists("arena_wall") &&
m_rendererSelectedTheme->elementExists("arena_block"))
@@ -70,7 +70,7 @@
{
m_rendererArenaItems = m_rendererDefaultTheme;
}
- // set the renderer for the bonus items
+ // set the renderer for the bonus items TODO: add all the bonus items
if(m_rendererSelectedTheme->elementExists("bonus_speed") &&
m_rendererSelectedTheme->elementExists("bonus_bomb") &&
m_rendererSelectedTheme->elementExists("bonus_range") &&
@@ -176,30 +176,48 @@
delete arenaItem;
arenaItem = NULL;
break;
- /*case Cell::ICE:
- arenaItem->setElementId("arena_ice");
- arenaItem->setZValue(0);
- break;
+ case Cell::ICE:
+ if(Settings::self()->showAllTiles() == 1)
+ {
+ arenaItem->setElementId("arena_ice");
+ arenaItem->setZValue(0);
+ break;
+ }
case Cell::BOMBTRAP:
- arenaItem->setElementId("arena_bomb_trap");
- arenaItem->setZValue(0);
- break;
+ if(Settings::self()->showAllTiles() == 1)
+ {
+ arenaItem->setElementId("arena_bomb_trap");
+ arenaItem->setZValue(0);
+ break;
+ }
case Cell::ARROWUP:
- arenaItem->setElementId("arena_arrow_up");
- arenaItem->setZValue(0);
- break;
+ if(Settings::self()->showAllTiles() == 1)
+ {
+ arenaItem->setElementId("arena_arrow_up");
+ arenaItem->setZValue(0);
+ break;
+ }
case Cell::ARROWRIGHT:
- arenaItem->setElementId("arena_arrow_right");
- arenaItem->setZValue(0);
- break;
+ if(Settings::self()->showAllTiles() == 1)
+ {
+ arenaItem->setElementId("arena_arrow_right");
+ arenaItem->setZValue(0);
+ break;
+ }
case Cell::ARROWDOWN:
- arenaItem->setElementId("arena_arrow_down");
- arenaItem->setZValue(0);
- break;
+ if(Settings::self()->showAllTiles() == 1)
+ {
+ arenaItem->setElementId("arena_arrow_down");
+ arenaItem->setZValue(0);
+ break;
+ }
case Cell::ARROWLEFT:
- arenaItem->setElementId("arena_arrow_left");
- arenaItem->setZValue(0);
- break;*/
+ if(Settings::self()->showAllTiles() == 1)
+ {
+ arenaItem->setElementId("arena_arrow_left");
+ arenaItem->setZValue(0);
+ break;
+ }
case Cell::GROUND:
case Cell::BLOCK:
default:
--- trunk/playground/games/granatier/src/generalsettings.ui #1032502:1032503
@@ -11,7 +11,24 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="2" rowspan="3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Points to win the game</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="kcfg_PointsToWin">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>20</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" rowspan="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -24,13 +41,30 @@
</property>
</spacer>
</item>
- <item row="2" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Round Time in Seconds</string>
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="kcfg_RoundTime">
+ <property name="minimum">
+ <number>30</number>
+ </property>
+ <property name="maximum">
+ <number>600</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <widget class="QCheckBox" name="kcfg_ShowAllTiles">
+ <property name="text">
+ <string> Show all tiles. Only for Artists! Won't be here at release</string>
+ </property>
+ </widget>
+ </item>
<item row="3" column="0" colspan="3">
<spacer name="verticalSpacer">
<property name="orientation">
@@ -44,33 +78,6 @@
</property>
</spacer>
</item>
- <item row="0" column="1" rowspan="2">
- <widget class="QSpinBox" name="kcfg_PointsToWin">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>20</number>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="kcfg_RoundTime">
- <property name="minimum">
- <number>30</number>
- </property>
- <property name="maximum">
- <number>600</number>
- </property>
- </widget>
- </item>
- <item row="0" column="0" rowspan="2">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Points to win the game</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<resources/>
--- trunk/playground/games/granatier/src/granatier.kcfg #1032502:1032503
@@ -37,5 +37,9 @@
<label>This is a dummy setting for player setup.</label>
<default>0</default>
</entry>
+ <entry name="ShowAllTiles" type="Int" key="ShowAllTiles">
+ <label>This is only for the artists to make their life easier.</label>
+ <default>0</default>
+ </entry>
</group>
</kcfg>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic