diff --git a/C++ProjectTemplate b/C++ProjectTemplate index cb898e9..bf3b1e4 100755 Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ diff --git a/main.cpp b/main.cpp index ad56e66..902821d 100644 --- a/main.cpp +++ b/main.cpp @@ -291,6 +291,24 @@ void Meteos::updateGame(float fElapsedTime){ break; } } + if (c.landTime>0){ + for (int h=0;h0){ + for (int j=0;j0){ + for (int h=0;h0){ + for (int j=0;j0){ + for (int h=0;h0){ + for (int j=0;j0){ + for (int h=0;h0){ + for (int j=0;j2||tempMatchIDsY.size()>2) { if (tempMatchIDsX.size()>2) { @@ -362,8 +431,18 @@ void Meteos::updateGame(float fElapsedTime){ } } for (BlockMatchingInfo i:matchedBlockIDs) { - Block&b=gameBoard.getBlockClumps()[i.c].getBlocks()[i.ind]; - b.col=BlockColor::LAUNCHED; + if (g==i.c){ + Block&b=gameBoard.getBlockClumps()[i.c].getBlocks()[i.ind]; + b.col=BlockColor::LAUNCHED; + } else { + Block&b=gameBoard.getBlockClumps()[i.c].getBlocks()[i.ind]; + if (!b.markedForRemoval){ + b.col=BlockColor::LAUNCHED; + c.addBlock(i.col,(gameBoard.getBlockClumps()[i.c].getBlockPosition(b).y-c.y)/12,BlockColor::LAUNCHED); + } + b.col=BlockColor::LAUNCHED; + b.markedForRemoval=true; + } } if (matchedBlockIDs.size()>0){ c.vspeed=gameBoard.launchSpd[std::min(c.combo,(int)gameBoard.launchSpd.size()-1)]/(1+(c.getBlocks().size()*gameBoard.blockWeight)); @@ -374,6 +453,15 @@ void Meteos::updateGame(float fElapsedTime){ //std::cout<<"Combo value is "<matchedBlockIDs; //Col followed by index for (int i=0;i