DjalimSimaila/SuperSpaceInvaderTurboApocalypseVsGOD
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

missiles are actually not dumb now

Browse Source
This commit is contained in:
Thomas 2022-01-02 19:24:49 +01:00
parent c6d3b022bc
commit 5b04846e7d
No known key found for this signature in database
GPG Key ID: E538821A6CDFDAD7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
headers/pixelManager.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_DRAWENGINE #ifndef GUARD_PIXELMANAGER_H
#define GUARD_DRAWENGINE #define GUARD_PIXELMANAGER_H
#include "mingl/mingl.h" #include "mingl/mingl.h"
#include "mingl/shape/line.h" #include "mingl/shape/line.h"
@ -11,6 +11,9 @@
class PixelManager{ class PixelManager{
public: public:
MinGL& window; MinGL& window;
nsGui::Sprite background = nsGui::Sprite("./assets/bg.sl2"); // you cant create an empty sprite for some reasons
explicit PixelManager(MinGL&); explicit PixelManager(MinGL&);
void drawInvader1(const nsGraphics::Vec2D& baseVector, unsigned size); void drawInvader1(const nsGraphics::Vec2D& baseVector, unsigned size);
void drawInvader2(const nsGraphics::Vec2D& baseVector, unsigned size); void drawInvader2(const nsGraphics::Vec2D& baseVector, unsigned size);
@ -18,7 +21,6 @@ public:
void drawPlayer(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor &color); void drawPlayer(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor &color);
void drawTorpedo(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color); void drawTorpedo(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color);
void drawMissile(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color); void drawMissile(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color);
nsGui::Sprite background = nsGui::Sprite("./assets/bg.sl2", nsGraphics::Vec2D(0,0)); // you cant create an empty sprite for some reasons
void drawBackground(); void drawBackground();
unsigned showInitialMenu(); unsigned showInitialMenu();

2
src/gameManagers.cpp
View File

@ -147,7 +147,7 @@ bool Game::checkMissilesAndPlayers() {
auto miss_ite = missiles.begin(); auto miss_ite = missiles.begin();
while(miss_ite!=missiles.end()){ while(miss_ite!=missiles.end()){
bool wasColliding = false; bool wasColliding = false;
if(miss_ite->getY()<=PLAYER_HEIGHT){ // check collision on Y if(miss_ite->getY()>=pm.getScreenHeight()-PLAYER_HEIGHT){ // check collision on Y
// now check collision on X (with both players) // now check collision on X (with both players)
for(Player& p : players){ for(Player& p : players){
if(areLinesColliding( if(areLinesColliding(