projects
/
ghostsoverboard
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7bdc418
)
Compiles again
author
Heli Hyvättinen
<heli.hyvattinen@kymp.net>
Mon, 12 Sep 2011 17:34:36 +0000
(20:34 +0300)
committer
Heli Hyvättinen
<heli.hyvattinen@kymp.net>
Mon, 12 Sep 2011 17:34:36 +0000
(20:34 +0300)
Mergetool put one { in wrong place, fixed.
seascene.cpp
patch
|
blob
|
history
diff --git
a/seascene.cpp
b/seascene.cpp
index
59a5ddc
..
85a72bb
100644
(file)
--- a/
seascene.cpp
+++ b/
seascene.cpp
@@
-784,7
+784,7
@@
void SeaScene::turnPauseOn()
pPauseAction_->setChecked(true);
}
-}
+
void SeaScene::createLevelCompletedItems()
{
@@
-799,3
+799,4
@@
void SeaScene::createLevelCompletedItems()
pTapForNextLevelItem->setPos(-60,100);
pTapForNextLevelItem->setZValue(1000);
pTapForNextLevelItem->setHtml("<font size=\"5\" color = darkorange>Tap to start the next level");
+}