diff --git a/assets/Map.aseprite b/assets/Map.aseprite deleted file mode 100644 index 7cb0feb..0000000 Binary files a/assets/Map.aseprite and /dev/null differ diff --git a/assets/MapNew-Sheet.aseprite b/assets/MapNew-Sheet.aseprite deleted file mode 100644 index 7f27b16..0000000 Binary files a/assets/MapNew-Sheet.aseprite and /dev/null differ diff --git a/assets/MapNew.aseprite b/assets/MapNew.aseprite deleted file mode 100644 index fb12db2..0000000 Binary files a/assets/MapNew.aseprite and /dev/null differ diff --git a/assets/MapNew.json b/assets/MapNew.json deleted file mode 100644 index f7526fc..0000000 --- a/assets/MapNew.json +++ /dev/null @@ -1,106 +0,0 @@ -{ "frames": [ - { - "filename": "MapNew.aseprite", - "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 192, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 224, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 256, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - }, - { - "filename": "MapNew.aseprite", - "frame": { "x": 288, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 100 - } - ], - "meta": { - "app": "https://www.aseprite.org/", - "version": "1.3.2-x64", - "format": "RGBA8888", - "size": { "w": 320, "h": 32 }, - "scale": "1", - "frameTags": [ - ], - "layers": [ - ], - "slices": [ - ] - } -} diff --git a/assets/MapNewBackup.aseprite b/assets/MapNewBackup.aseprite deleted file mode 100644 index fb12db2..0000000 Binary files a/assets/MapNewBackup.aseprite and /dev/null differ diff --git a/assets/MapTest.aseprite b/assets/MapTest.aseprite deleted file mode 100644 index c047008..0000000 Binary files a/assets/MapTest.aseprite and /dev/null differ diff --git a/assets/Player1Victory.png b/assets/Player1Victory.png deleted file mode 100644 index f50a386..0000000 Binary files a/assets/Player1Victory.png and /dev/null differ diff --git a/assets/Player2Victory.png b/assets/Player2Victory.png deleted file mode 100644 index 7a20be3..0000000 Binary files a/assets/Player2Victory.png and /dev/null differ diff --git a/assets/SDL_map_test.txt b/assets/SDL_map_test.txt deleted file mode 100644 index 809f2e3..0000000 --- a/assets/SDL_map_test.txt +++ /dev/null @@ -1,20 +0,0 @@ -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,2,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,2,2,2,3 -3,3,3,2,3,3,3,3,2,3,7,1,1,1,9,3,3,3,3,3,3,3,2,2,3 -3,3,2,2,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,3,2,2,2,3,3,3,3,3,7,1,1,1,9,3,3,2,3,3,3,3,3,3,3 -3,3,2,2,2,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,3,3,2,2,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,3,3,3,2,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,2,3,3,3,3 -3,3,3,2,2,3,3,3,3,3,7,1,1,1,9,3,3,3,3,2,2,3,3,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,2,2,2,3,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,2,2,3,3,3,3 -3,3,3,3,3,3,3,2,3,3,7,1,1,1,9,3,2,3,3,2,3,3,3,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,2,3,3,3,3,3,3,3,3 -2,2,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,2,2,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 -3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3 diff --git a/assets/VictoryBackup.aseprite b/assets/VictoryBackup.aseprite deleted file mode 100644 index b53cd97..0000000 Binary files a/assets/VictoryBackup.aseprite and /dev/null differ diff --git a/assets/atk_speed_powerup.png b/assets/atk_speed_powerup.png deleted file mode 100644 index 9bcce69..0000000 Binary files a/assets/atk_speed_powerup.png and /dev/null differ diff --git a/assets/cat.png b/assets/cat.png deleted file mode 100644 index 4b52f0f..0000000 Binary files a/assets/cat.png and /dev/null differ diff --git a/assets/characterSelection.png b/assets/characterSelection.png deleted file mode 100644 index 68e958a..0000000 Binary files a/assets/characterSelection.png and /dev/null differ diff --git a/assets/chicken_gentleman_spritesheet.png b/assets/chicken_gentleman_spritesheet.png deleted file mode 100644 index 848c426..0000000 Binary files a/assets/chicken_gentleman_spritesheet.png and /dev/null differ diff --git a/assets/chicken_knight_spritesheet.png b/assets/chicken_knight_spritesheet.png deleted file mode 100644 index 2304ae6..0000000 Binary files a/assets/chicken_knight_spritesheet.png and /dev/null differ diff --git a/assets/chicken_mlady_spritesheet.png b/assets/chicken_mlady_spritesheet.png deleted file mode 100644 index c075990..0000000 Binary files a/assets/chicken_mlady_spritesheet.png and /dev/null differ diff --git a/assets/chicken_neutral.png b/assets/chicken_neutral.png deleted file mode 100644 index 8a68462..0000000 Binary files a/assets/chicken_neutral.png and /dev/null differ diff --git a/assets/chicken_neutral_knight.png b/assets/chicken_neutral_knight.png deleted file mode 100644 index 1cf69c9..0000000 Binary files a/assets/chicken_neutral_knight.png and /dev/null differ diff --git a/assets/chicken_neutral_mlady.png b/assets/chicken_neutral_mlady.png deleted file mode 100644 index 3973d7d..0000000 Binary files a/assets/chicken_neutral_mlady.png and /dev/null differ diff --git a/assets/chicken_neutral_wizard.png b/assets/chicken_neutral_wizard.png deleted file mode 100644 index aba3980..0000000 Binary files a/assets/chicken_neutral_wizard.png and /dev/null differ diff --git a/assets/chicken_spritesheet.png b/assets/chicken_spritesheet.png deleted file mode 100644 index ba003eb..0000000 Binary files a/assets/chicken_spritesheet.png and /dev/null differ diff --git a/assets/chicken_wizard_spritesheet.png b/assets/chicken_wizard_spritesheet.png deleted file mode 100644 index 8694c93..0000000 Binary files a/assets/chicken_wizard_spritesheet.png and /dev/null differ diff --git a/assets/chicken_wizzard_spritesheet.png b/assets/chicken_wizzard_spritesheet.png deleted file mode 100644 index 27e8796..0000000 Binary files a/assets/chicken_wizzard_spritesheet.png and /dev/null differ diff --git a/assets/cow.png b/assets/cow.png deleted file mode 100644 index 956895f..0000000 Binary files a/assets/cow.png and /dev/null differ diff --git a/assets/dirt.png b/assets/dirt.png deleted file mode 100644 index b60025b..0000000 Binary files a/assets/dirt.png and /dev/null differ diff --git a/assets/egg.png b/assets/egg.png deleted file mode 100644 index f0a12bf..0000000 Binary files a/assets/egg.png and /dev/null differ diff --git a/assets/grass.png b/assets/grass.png deleted file mode 100644 index b096692..0000000 Binary files a/assets/grass.png and /dev/null differ diff --git a/assets/grass_water_left.png b/assets/grass_water_left.png deleted file mode 100644 index 6a22a75..0000000 Binary files a/assets/grass_water_left.png and /dev/null differ diff --git a/assets/grass_water_right.png b/assets/grass_water_right.png deleted file mode 100644 index fa75ce7..0000000 Binary files a/assets/grass_water_right.png and /dev/null differ diff --git a/assets/heart.png b/assets/heart.png deleted file mode 100644 index 867809b..0000000 Binary files a/assets/heart.png and /dev/null differ diff --git a/assets/heart_powerup.png b/assets/heart_powerup.png deleted file mode 100644 index 0a2a92d..0000000 Binary files a/assets/heart_powerup.png and /dev/null differ diff --git a/assets/iconImage.bmp b/assets/iconImage.bmp deleted file mode 100644 index 6eddbef..0000000 Binary files a/assets/iconImage.bmp and /dev/null differ diff --git a/assets/movement_speed_powerup.png b/assets/movement_speed_powerup.png deleted file mode 100644 index e0876ec..0000000 Binary files a/assets/movement_speed_powerup.png and /dev/null differ diff --git a/assets/sound/background_music.mp3 b/assets/sound/background_music.mp3 deleted file mode 100644 index f79cd6c..0000000 Binary files a/assets/sound/background_music.mp3 and /dev/null differ diff --git a/assets/sound/steps.wav b/assets/sound/steps.wav deleted file mode 100644 index a060c29..0000000 Binary files a/assets/sound/steps.wav and /dev/null differ diff --git a/assets/sound/throw_egg.wav b/assets/sound/throw_egg.wav deleted file mode 100644 index 67dc0e7..0000000 Binary files a/assets/sound/throw_egg.wav and /dev/null differ diff --git a/assets/startscreen.png b/assets/startscreen.png deleted file mode 100644 index a1fe40d..0000000 Binary files a/assets/startscreen.png and /dev/null differ diff --git a/assets/stone.png b/assets/stone.png deleted file mode 100644 index 4798d7b..0000000 Binary files a/assets/stone.png and /dev/null differ diff --git a/assets/title_screen.png b/assets/title_screen.png deleted file mode 100644 index e8bb2f3..0000000 Binary files a/assets/title_screen.png and /dev/null differ diff --git a/assets/title_screen_backup.aseprite b/assets/title_screen_backup.aseprite deleted file mode 100644 index 21d6030..0000000 Binary files a/assets/title_screen_backup.aseprite and /dev/null differ diff --git a/assets/water.png b/assets/water.png deleted file mode 100644 index 88dfbeb..0000000 Binary files a/assets/water.png and /dev/null differ diff --git a/assets/water1.ase b/assets/water1.ase deleted file mode 100644 index 86e75e3..0000000 Binary files a/assets/water1.ase and /dev/null differ diff --git a/assets/water1.png b/assets/water1.png deleted file mode 100644 index 7ef949c..0000000 Binary files a/assets/water1.png and /dev/null differ diff --git a/src/GameInternal.cpp b/src/GameInternal.cpp index c5ba507..7f1ac27 100644 --- a/src/GameInternal.cpp +++ b/src/GameInternal.cpp @@ -5,6 +5,7 @@ #include "CollisionHandler.h" #include "AssetManager.h" #include "RenderManager.h" +#include "SDL_mixer.h" #include "SoundManager.h" #include "TileComponent.h" #include "Direction.h" @@ -62,11 +63,11 @@ void GameInternal::init(const char* title, int xpos, int ypos, int width, int he return; } - SDL_Surface* icon = SDL_LoadBMP("assets/iconImage.bmp"); - if(!icon) + // bad + SDL_Surface* icon; + if((icon = SDL_LoadBMP("assets/iconImage.bmp"))) { - std::cout << "ERROR: Couldn't create icon!" << std::endl; - return; + SDL_SetWindowIcon(window, icon); } SDL_SetWindowIcon(window, icon); @@ -80,12 +81,6 @@ void GameInternal::init(const char* title, int xpos, int ypos, int width, int he } SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255); - SDL_Texture* backgroundTexture = GameInternal::textureManager->loadTexture("assets/startscreen.png"); - - SDL_RenderClear(renderer); - SDL_RenderCopy(renderer, backgroundTexture, NULL, NULL); - SDL_RenderPresent(renderer); - if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 2048) < 0) { std::cout << "ERROR: Mixer couldnt be initialized! " << SDL_GetError() << std::endl; @@ -96,43 +91,6 @@ void GameInternal::init(const char* title, int xpos, int ypos, int width, int he Mix_Volume(-1, MIX_MAX_VOLUME); Mix_AllocateChannels(16); - //SDL_Event event; - bool hasQuit = false; - - while (!hasQuit) - { - SDL_PollEvent(&event); - - if (event.type == SDL_QUIT) - { - hasQuit = true; - break; - } - - if (event.type == SDL_KEYDOWN) - { - if (event.key.keysym.scancode == SDL_SCANCODE_RETURN) - { - std::cout << "Enter pressed > Game start..." << std::endl; - break; - } - - if (event.key.keysym.scancode == SDL_SCANCODE_ESCAPE) - { - std::cout << "Escape pressed > Game quit..." << std::endl; - hasQuit = true; - } - } - } - - if (hasQuit) - { - this->setRunning(false); - return; - } - - if (this->isRunning() == false) return; - map = new Map(); // loading sounds diff --git a/src/Map.cpp b/src/Map.cpp index 5689d9e..072398f 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -61,6 +61,6 @@ void Map::addTile(unsigned long id, int x, int y, GameInternal* game, const std: auto& tile(game->manager.addEntity()); tile.addComponent(x, y, TILE_SIZE, TILE_SIZE, id, textureDict); - if(tile.getComponent().hasCollision()) tile.addComponent(tile.getComponent().getName().data()); + if(tile.getComponent().hasCollision()) tile.addComponent("tile"/*tile.getComponent().getName().data()*/); tile.addGroup((size_t)Entity::GroupLabel::MAPTILES); } \ No newline at end of file