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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Thomas 2022-01-12 22:22:09 +01:00
commit 16220d754a
No known key found for this signature in database
GPG Key ID: E538821A6CDFDAD7
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
headers/game.h
View File

@ -36,7 +36,12 @@ private:
* @brief the MinGL window in which the game will be drawn into
*/
MinGL window;
/*!
* @brief Harcoded window size
*/
const Position winSize{1280,720};
/*!
* @brief PixelManager : Class that contains and draws all the data that will be drawn on screen
* This is a pointer because the object is allocated at runtime, following the configuration

5
src/gameBasics.cpp
View File

@ -15,7 +15,7 @@
#include "playMode.h"
#include "goodPixelManager.h"
#define WININIT window("SUPER Space Invader : Turbo Apocalypse DX - VS GOD", Position(1280, 720), Position(128, 128), nsGraphics::KBlack)
#define WININIT window("SUPER Space Invader : Turbo Apocalypse DX - VS GOD", Position(1280, 720) /*for some reason I can't use the winSize member here*/, Position(128, 128), nsGraphics::KBlack)
Game::Game() : WININIT {
@ -128,6 +128,9 @@ WinValue Game::enterGameLoop(){ // returns when game is finished
fpsStartTime = startTime;
}
// force window size
if(window.getWindowSize()!=winSize)window.setWindowSize(winSize);
pm->startFrame();
managePlayers();

2
src/gameManagers.cpp
View File

@ -105,10 +105,10 @@ bool Game::manageInvaders(){
void Game::remCollidingProjectiles(){
auto miss = missiles.begin();
auto tor = torpedos.begin();
while(miss != missiles.end()){
bool wasColliding = false;
auto tor = torpedos.begin();
while(tor != torpedos.end()){
// missiles can't be right under torpedos, so that must means they are colliding in Y