From 1c8f72e574cf69c9f590ac50b064af716ef1bce2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Heli=20Hyv=C3=A4ttinen?= Date: Wed, 8 Jun 2011 22:24:44 +0300 Subject: [PATCH] Ghosts now visible aboard The ship now has different images for 0-10 ghosts aboard. for more than ten, the image with ten ghosts is used. --- laiva_10aave.png | Bin 0 -> 2250 bytes laiva_1aave.png | Bin 0 -> 1957 bytes laiva_2aave.png | Bin 0 -> 1992 bytes laiva_3aave.png | Bin 0 -> 2031 bytes laiva_4aave.png | Bin 0 -> 2057 bytes laiva_5aave.png | Bin 0 -> 2097 bytes laiva_6aave.png | Bin 0 -> 2178 bytes laiva_7aave.png | Bin 0 -> 2208 bytes laiva_8aave.png | Bin 0 -> 2213 bytes laiva_9aave.png | Bin 0 -> 2225 bytes orientationcontrol2pix.qrc | 10 ++++++++++ seascene.cpp | 15 ++++++++++++++- ship.cpp | 13 +++++++++++-- ship.h | 11 +++++++++-- 14 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 laiva_10aave.png create mode 100644 laiva_1aave.png create mode 100644 laiva_2aave.png create mode 100644 laiva_3aave.png create mode 100644 laiva_4aave.png create mode 100644 laiva_5aave.png create mode 100644 laiva_6aave.png create mode 100644 laiva_7aave.png create mode 100644 laiva_8aave.png create mode 100644 laiva_9aave.png diff --git a/laiva_10aave.png b/laiva_10aave.png new file mode 100644 index 0000000000000000000000000000000000000000..616529c9c254c1a2e73634af25bc5ad241d608af GIT binary patch literal 2250 zcmV;*2sQVKP)Px#24YJ`L;&Xi=K$yNbP-Mf000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXA< z5C_CX>@2HM@dakSAh-}000OjNklPbzE5>%v3)I_N^tAErO zQ=_DfX;PY|QY5LEo>d!bO@lSGcPd0%g^C4hK}@+*IIY0lL5{=U^L+cq%gL1oW!-$;M}zzb#PTa-|@hT6>rR~u6}M# zW##HQl~uXV8PN6tICZeM_tn9k-gzH#!kzE!*)!G5&IQ~JiB$5|1!Koe_&gN^%mBko zIBXp3?Y(cXx3~2F&U$z6-sl_{Qek*+Dh&U9@r)V2>zF%t^5+2P&H-Eu3IMnRhG+YC z@4n>uC!Y8o0L+^E)dR^eygZps?@WXt5@8C-RO<3X81B60!V8~ScKK!3-gNcV$&bCu zCtD=OMEx!iSO zMMY~SmqQ|z`r*<^3hO-77gt+b)dZ09ZZDfg(tP6eJ;?&0=ip#Br3iy}4z}ZIsqe zojv<7fTsc6v%I6DHIYgJ!0yjN!AAjH8M&eDiQv>CG6s!QqzFn8xVVqhfXKg7THAi! zc~6~?BaIHQXAR)4Hx(cZBq0i3L%J{IS9=!O9D_%XxD0XL)+(ok6 z%Y)?op4>2Up?^!gp#Mn3W7m2TV>U>f&ByJ)3I;FwbSD(D%nrqgd6ky+u9TOyO zBUS0kg5cPokOcY?(3U%3TqTc<;yp2VOCfSg)rZ51QPtuY=2ZaQHZ*jm4Gql$u*`sJnI$Q^ z3;?E`amK#sGiP4%pT54_rstk}+mnYqeXOEC5{BWLDO0DeAX!i9NlzcENu)CwEMEMb zy`yawiZEuj2|zccn@Xbf+*ske45%I)7zke9y7eH*Ns`_siMF=W7MwY2)~!v=&Fj*c z%py--;JrXa9Y$?!Eea3%iA>Bxhw3TaXl8KE!39B9W}vJ}CYTu<@D(%L3ZRM-1_t_( z&E;y&S+JmDczC$_-M&7Z(%7(cczC$-`3-*t#YaiPV3GSfVElv$AbBo;hdz;ll&<$u zwO0f)5}C!SfJ6{f!?`L0Kr{UHg^kEoRHOhb3)AVUvE#=FVLH83X7KTKW-%NLQ`)AY zxupd%eK~fY69@FvWRfrmG=rDm<624yUV?M3tpNVo%dcSIzyV}3*@KjBEUbGfo2#ru zV`Ebc2UJy6V&Mgg(01BskQvgc)a=;L>yI(4AGMt zP;3rTi3Aw=Cd>>^J@#7wK+CwXm0qeYtQYo~?X!@3BdfRG+!f58GY8pR4xS!iDg`)~ zk{Qf!+0mv>-n??oNn(kO%@yKYeB}X-XT?>2%Rel0p1GFqm+RFS-wz#@Ycq2H2!9lSOS) z6Ixoogu3Qa(Ku!dkVr%gX)1+85CCS_zkfgOxM3Lrm%sz-etjUD&D9nj$V@N;l0gE= zL{J3xBm(D<4#T3#Fzd?I)-L?mD86~+%FV0t`3s#3wjLfD%DwZ}F7)i&36ThMSyVSP z9y&D8zdM_&7*pHWP*Yu34|5KH!>svdBb7>nVl+>gMG7Ly1Tirb1tAcWTfxlso^YvK zmCr9H^Fcj8{%EsqF z(J_N!ICs=OQu+aRKY;n2U0olHx}&~p*|NJy-a#^5?2t>^`QjWR57JN=}UH||9 literal 0 HcmV?d00001 diff --git a/laiva_1aave.png b/laiva_1aave.png new file mode 100644 index 0000000000000000000000000000000000000000..66783c026ec22e7918278045e4fdc120c274089d GIT binary patch literal 1957 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 bUmO1g`C|+`al}1>00000NkvXXu0mjfn!oqv literal 0 HcmV?d00001 diff --git a/laiva_6aave.png b/laiva_6aave.png new file mode 100644 index 0000000000000000000000000000000000000000..71839c4a66d7a08eaea68bf44451f4dd9a78445d GIT binary patch literal 2178 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 literal 0 HcmV?d00001 diff --git a/laiva_9aave.png b/laiva_9aave.png new file mode 100644 index 0000000000000000000000000000000000000000..2d771f845283253e7e8f4154463699b6dfd04bb7 GIT binary patch literal 2225 zcmV;i2u}BjP)Px#24YJ`L;&Xi=K$yNbP-Mf000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXA< z5C;y5N=Z`y000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000OKNkl_Ucx_j&&PaL&xmf+A(n zG>s=YnaO+3%=f-%_^h(>%;yYf2LYTv(A~XbpsV|mkGWyh{(bwVnAzokyEC3lET1=K?D)@9LBI?! z%z(p|f$r{y2fDk9|L@`tdwRlqU`PhRL&+fc_qEff|E6X3>`9*kpt}rk5hws)B@8be z-m~YrS2k?;E&$A&{nfri5G+ijQt!rt0P!G+L^8QB9t7_$zWVAHTNmDN+ugU^k~r-y zXBi+ZfISCu4i2|RkWa}7PeBw0`VXV`gT38j8YVQ3pFaKAf=QDuNo6wCL1}4INhWi9 zP+HnhlF1;RO#a}f>(~GAllDrSrETX&Z~&|t=0Fi7K?;(PN~bZVVZvBSyWZQr{a#9& zrZhJn1MmWX2bZ?AG{ln$0NC?cDEJJ3n?g6VeIcAiiHtx)6)A#J2reEZ)i3g|l%8t3 z;);!DPnzqqOOYYp&UO&Hx9xyCwi` zl%$`Fn(oEtMD8ZFiYCze2uejzk@=-&Nsp6k%CAST12V4j)MMA)c;k){MzNbq@_mw> zULGVL@#GeYp!XmNpI1zTmk(8wAo6k2FAZTmL=P_yFP78mE|Guv?XTKz8WAALfYdhc z*+S1|l3OXh;K?FW65e~zM+$ilAA+~dy=uWWPu@yKDtkdBya-Re>B)^FGVy`;-oKL4 z<_KgPrKTaDQ>cst?^!Ul#K<@GCy8%)>Pk}6C2lAAHl=~cSD(Le@#0M*0_@$rd%VP5 zq{{rTAUHKBB!T|pt`&UrTM|1x^|r|GFIuwX>2njsy}dJ!A3uKa;e!Wud+M7ams5;| z>7_We3@I2!Zx}Q_9~_Z8NczK~B}=}3P7<}{a+3jc0LWC=)YQ9lx?|VtuRmkXEgKvh zygue!8BdMkeG&MmeB>6Z4~G>auEmziHCQfp34m4uvNB6hb^`!RyYRw;UzsuEx{rE$ zGq1h;@?K9K^YoF5{&)}sYbQ^cvVvqaspma?q$ZInDZ!#e-|iU^V5Hg(0G*WXE{fL6 zEthKmaK8cBf&Tv3+dFq2AvsafUXo~RoI3BKnKPHy)z`02m6R;--+vhCOs3+pdGksK2M4ns_V(($+L~Jj2M5bu z+5AUPe1;?p7P`L!#*H5jl9vN`@~jl((WBLr?iz~BLRCOK7R$o9asxm!{Q1=_NSBr- z0kj6GRQZ^3<6=Q7b*s$aqu-fDa4<}6oPzpMqaf3lBKJ89KHyT%I45&9i19oyow{BSTkcuCy0`z(p$%r% z0y78*Q-g>gob z9re2g6Mm7(mfwEbM7^f1tqH)hfK3G4M^*Lp7(aDNO;!E*s2x2Th{wZ*G?_#^76Z(1 z=+Ggoyt5TC7ssRPf7zE#XDag#WG0vaiC7$oc&zY1o^?C(J$ftYjC^3X8*eN|1( zH_o^g|Kz^=o)UT6P;(gq`NHgxpF_g3<%{ZVq4m$V{XXmq0U(u5W88!ZeJx9t>}qJ7 zd}%>#prfv?ZvL4Ae(&Ba#eaIKUY^4{97B!}FcYVA82;mWQ*UVc(*+6T>vc(||R#cXo6E zK>X7HUwY$>6JMJ(t6ru#Qn)!yFaa{bXpjk#g>#2Rp939UUjmx}(0o zweXU(rv~k!B=bk*LZx#UH-kWbOBY6SE3q(yK6%?lziH9kcN_IXB z^>By*76;rB03L<|a99V}YsEhI#qq`Qzjpiw(-i)v_OGGT00000NkvXXu0mjfvH&Zc literal 0 HcmV?d00001 diff --git a/orientationcontrol2pix.qrc b/orientationcontrol2pix.qrc index 27a9a3a..8ac3974 100644 --- a/orientationcontrol2pix.qrc +++ b/orientationcontrol2pix.qrc @@ -5,5 +5,15 @@ kari.png aave.png laiva.png + laiva_1aave.png + laiva_2aave.png + laiva_3aave.png + laiva_4aave.png + laiva_5aave.png + laiva_6aave.png + laiva_7aave.png + laiva_8aave.png + laiva_9aave.png + laiva_10aave.png diff --git a/seascene.cpp b/seascene.cpp index 3183161..e4162be 100644 --- a/seascene.cpp +++ b/seascene.cpp @@ -101,7 +101,20 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses) return; } - Ship * pShip = new Ship (QPixmap(":/pix/laiva.png")); + QList shipImages; + shipImages.append(QPixmap(":/pix/laiva.png")); + shipImages.append(QPixmap(":/pix/laiva_1aave.png")); + shipImages.append(QPixmap(":/pix/laiva_2aave.png")); + shipImages.append(QPixmap(":/pix/laiva_3aave.png")); + shipImages.append(QPixmap(":/pix/laiva_4aave.png")); + shipImages.append(QPixmap(":/pix/laiva_5aave.png")); + shipImages.append(QPixmap(":/pix/laiva_6aave.png")); + shipImages.append(QPixmap(":/pix/laiva_7aave.png")); + shipImages.append(QPixmap(":/pix/laiva_8aave.png")); + shipImages.append(QPixmap(":/pix/laiva_9aave.png")); + shipImages.append(QPixmap(":/pix/laiva_10aave.png")); + + Ship * pShip = new Ship (shipImages); pShip->setData(0,"ship"); pShip->setPos(*pPosition); addItem(pShip); diff --git a/ship.cpp b/ship.cpp index 4a516e7..e9541d9 100644 --- a/ship.cpp +++ b/ship.cpp @@ -1,9 +1,10 @@ #include "ship.h" #include -Ship::Ship(QPixmap pixmap, QGraphicsItem *parent) : - OrientationControlledGraphicsPixmapObject(pixmap,parent) +Ship::Ship(QList pixmapList, QGraphicsItem *parent) : + OrientationControlledGraphicsPixmapObject(pixmapList.at(0),parent) { + shipImages_ = pixmapList; ghostsAboard_ = 0; } @@ -27,6 +28,7 @@ bool Ship::handleCollisions() // drop all ghosts when hitting an obstacle emit droppingGhosts(ghostsAboard_); ghostsAboard_ = 0; + updateShipImage(); return false; } @@ -34,6 +36,7 @@ bool Ship::handleCollisions() else if (type == "ghost") { ghostsAboard_++; + updateShipImage(); qDebug() << ghostsAboard_ << " ghosts aboard"; @@ -44,3 +47,9 @@ bool Ship::handleCollisions() } } + +void Ship::updateShipImage() +{ + int index = qBound(0,ghostsAboard_,shipImages_.length()-1); + setPixmap(shipImages_.at(index)); +} diff --git a/ship.h b/ship.h index 62acfd1..47c4cff 100644 --- a/ship.h +++ b/ship.h @@ -5,15 +5,18 @@ class Ship : public OrientationControlledGraphicsPixmapObject { - Q_OBJECT + + Q_OBJECT public: - explicit Ship(QPixmap pixmap = 0, QGraphicsItem *parent = 0); + explicit Ship(QList pixmapList, QGraphicsItem *parent = 0); signals: /*! Emitted when a ghost is hit */ void pickingGhost(QGraphicsItem* pGhost); + + /*! Emitted when ghosts fall over board */ void droppingGhosts (int ghosts); @@ -24,8 +27,12 @@ protected: protected: bool handleCollisions(); + void updateShipImage(); + int ghostsAboard_; + QList shipImages_; + }; -- 1.7.9.5