Refactoring

Author: dbeef

CMakeLists.txt

@@ -51,4 +51,4 @@ add_executable(spelunkyds
         source/collisions/collisions.cpp
         source/collisions/collisions.hpp
         source/hud/hud.cpp source/hud/hud.hpp
-        source/sprites/sprite_info.cpp source/sprites/sprite_info.h source/camera/camera.cpp source/camera/camera.hpp source/memory/oam_manager.cpp source/memory/oam_manager.hpp source/input/input_handler.cpp source/input/input_handler.hpp source/sprites/spritesheet_type.hpp source/memory/oam_type.hpp source/sprites/items/rock.hpp source/sprites/items/jar.cpp source/sprites/items/jar.hpp source/sprites/enemies/snake.cpp source/sprites/enemies/snake.hpp source/sprites/collectibles/moniez.cpp source/sprites/collectibles/moniez.hpp source/tiles/map_tile_type.hpp source/sprites/animations/blood.cpp source/sprites/animations/blood.hpp source/sprites/animations/blood_element.cpp source/sprites/animations/blood_element.hpp source/sprites/non_interactive/spelunky_title.cpp source/sprites/non_interactive/spelunky_title.h source/tiles/tile_orientation.hpp source/sprites/non_interactive/title_menu_sign.cpp source/sprites/non_interactive/title_menu_sign.h source/sprites/menu_sign_type.hpp source/tiles/splash_screen_type.hpp source/rooms/left_right_rooms.hpp source/rooms/left_right_down_rooms.hpp source/rooms/left_right_up_rooms.hpp source/rooms/closed_rooms.hpp source/rooms/splash_screens.hpp source/rooms/entrance_rooms.hpp source/rooms/exit_rooms.hpp source/rooms/RoomType.hpp source/sprites/enemies/bat.cpp source/sprites/enemies/bat.hpp source/sprites/enemies/spider.cpp source/sprites/enemies/spider.hpp source/sprites/sprite_type.hpp source/globals_definitions.hpp source/sound/sound_utils.hpp source/console/console_utils.hpp source/time/time_utils.h source/time/time_utils.cpp source/memory/oam_utils.cpp source/memory/oam_utils.hpp source/sprites/main_dude/whip.cpp source/sprites/main_dude/whip.hpp source/sprites/traps/spikes.cpp source/sprites/traps/spikes.h source/sprites/collectibles/chest.cpp source/sprites/collectibles/chest.hpp source/sprites/collectibles/crate.hpp source/sprites/collectibles/crate.cpp source/sprites/collectibles/shotgun.hpp source/sprites/collectibles/shotgun.cpp source/sprites/collectibles/bullet.hpp source/sprites/collectibles/bullet.cpp source/sprites/collectibles/spring_shoes.hpp source/sprites/collectibles/spring_shoes.cpp source/sprites/collectibles/mitt.hpp source/sprites/collectibles/mitt.cpp source/sprites/collectibles/glove.hpp source/sprites/collectibles/glove.cpp source/sprites/collectibles/compass.hpp source/sprites/collectibles/compass.cpp source/sprites/animations/got_collectible.hpp source/sprites/animations/got_collectible.cpp source/camera/layer_level.hpp source/sprites/enemies/shopkeeper.hpp source/sprites/enemies/shopkeeper.cpp source/sprites/main_dude/dude_utils.cpp source/sprites/main_dude/game_state.hpp source/sprites/main_dude/game_state.cpp source/sprites/enemies/caveman.hpp source/sprites/enemies/caveman.cpp source/sprites/animations/fall_poof.hpp source/sprites/animations/fall_poof.cpp source/sprites/items/cape.hpp source/sprites/items/cape.cpp source/sprites/items/spike_shoes.hpp source/sprites/items/spike_shoes.cpp source/sprites/items/pick.hpp source/sprites/items/pick.cpp source/sprites/items/jetpack.hpp source/sprites/items/jetpack.cpp source/sprites/items/parachute.hpp source/sprites/items/parachute.cpp source/sprites/items/rope_pile.hpp source/sprites/items/rope_pile.cpp source/sprites/items/bomb_bag.hpp source/sprites/items/bomb_bag.cpp source/sprites/items/bomb_box.hpp source/sprites/items/bomb_box.cpp source/sprites/animations/flame.hpp source/sprites/animations/flame_element.cpp source/sprites/animations/flame.cpp source/sprites/animations/flame_element.hpp source/sprites/enemies/damsel.hpp source/sprites/enemies/damsel.cpp source/sprites/animations/smooch.hpp source/sprites/animations/smooch.cpp source/rooms/shops.hpp source/sprites/non_interactive/lamp.h source/sprites/non_interactive/lamp.cpp source/tiles/direction.hpp source/sprites/collectibles/collectibles_utils.hpp source/sprites/collectibles/collectibles_utils.cpp source/sprites/shopping_object.h source/sprites/non_interactive/shopping_icon.h source/sprites/non_interactive/shopping_icon.cpp source/sprites/shopping_object.cpp source/sprites/traps/arrow_trap.h source/sprites/traps/arrow_trap.cpp source/sprites/animations/blast.hpp source/sprites/animations/blast.cpp source/rooms/snake_well.hpp source/sprites/enemies/skeleton.cpp source/sprites/enemies/skeleton.hpp source/sound/sound_utils.cpp source/sprites/animations/bone.hpp source/sprites/animations/bone.cpp source/sprites/animations/skull.hpp source/sprites/animations/skull.cpp source/sprites/animations/fake_skeleton.hpp source/sprites/animations/fake_skeleton.cpp source/globals_definitions.cpp source/base_map.hpp source/sprites/sprite_utils.cpp source/sprites/sprite_utils.hpp source/tiles/level_generator.hpp source/tiles/level_generator.cpp source/sprites/simple_sprite_wrapper.h source/sprites/simple_sprite_wrapper.cpp source/tiles/populating_utils.hpp source/tiles/populating_utils.cpp source/sprites/collectibles/ruby_big.h source/sprites/collectibles/ruby_small.h source/sprites/collectibles/triple_goldbar.h  source/sprites/collectibles/triple_goldbar.cpp source/sprites/collectibles/single_goldbar.hpp source/sprites/collectibles/single_goldbar.cpp source/sprites/collectibles/ruby_small.cpp source/sprites/collectibles/ruby_big.cpp)
+        source/sprites/sprite_info.cpp source/sprites/sprite_info.h source/camera/camera.cpp source/camera/camera.hpp source/memory/oam_manager.cpp source/memory/oam_manager.hpp source/input/input_handler.cpp source/input/input_handler.hpp source/sprites/spritesheet_type.hpp source/memory/oam_type.hpp source/sprites/items/rock.hpp source/sprites/items/jar.cpp source/sprites/items/jar.hpp source/sprites/enemies/snake.cpp source/sprites/enemies/snake.hpp source/sprites/collectibles/moniez.cpp source/sprites/collectibles/moniez.hpp source/tiles/map_tile_type.hpp source/sprites/animations/blood.cpp source/sprites/animations/blood.hpp source/sprites/animations/blood_element.cpp source/sprites/animations/blood_element.hpp source/sprites/non_interactive/spelunky_title.cpp source/sprites/non_interactive/spelunky_title.h source/tiles/tile_orientation.hpp source/sprites/non_interactive/title_menu_sign.cpp source/sprites/non_interactive/title_menu_sign.h source/sprites/menu_sign_type.hpp source/tiles/splash_screen_type.hpp source/rooms/left_right_rooms.hpp source/rooms/left_right_down_rooms.hpp source/rooms/left_right_up_rooms.hpp source/rooms/closed_rooms.hpp source/rooms/splash_screens.hpp source/rooms/entrance_rooms.hpp source/rooms/exit_rooms.hpp source/rooms/RoomType.hpp source/sprites/enemies/bat.cpp source/sprites/enemies/bat.hpp source/sprites/enemies/spider.cpp source/sprites/enemies/spider.hpp source/sprites/sprite_type.hpp source/globals_definitions.hpp source/sound/sound_utils.hpp source/console/console_utils.hpp source/time/time_utils.h source/time/time_utils.cpp source/memory/oam_utils.cpp source/memory/oam_utils.hpp source/sprites/main_dude/whip.cpp source/sprites/main_dude/whip.hpp source/sprites/traps/spikes.cpp source/sprites/traps/spikes.h source/sprites/collectibles/chest.cpp source/sprites/collectibles/chest.hpp source/sprites/collectibles/crate.hpp source/sprites/collectibles/crate.cpp source/sprites/collectibles/shotgun.hpp source/sprites/collectibles/shotgun.cpp source/sprites/collectibles/bullet.hpp source/sprites/collectibles/bullet.cpp source/sprites/collectibles/spring_shoes.hpp source/sprites/collectibles/spring_shoes.cpp source/sprites/collectibles/mitt.hpp source/sprites/collectibles/mitt.cpp source/sprites/collectibles/glove.hpp source/sprites/collectibles/glove.cpp source/sprites/collectibles/compass.hpp source/sprites/collectibles/compass.cpp source/sprites/animations/got_collectible.hpp source/sprites/animations/got_collectible.cpp source/camera/layer_level.hpp source/sprites/enemies/shopkeeper.hpp source/sprites/enemies/shopkeeper.cpp source/sprites/main_dude/dude_utils.cpp source/sprites/main_dude/game_state.hpp source/sprites/main_dude/game_state.cpp source/sprites/enemies/caveman.hpp source/sprites/enemies/caveman.cpp source/sprites/animations/fall_poof.hpp source/sprites/animations/fall_poof.cpp source/sprites/items/cape.hpp source/sprites/items/cape.cpp source/sprites/items/spike_shoes.hpp source/sprites/items/spike_shoes.cpp source/sprites/items/pick.hpp source/sprites/items/pick.cpp source/sprites/items/jetpack.hpp source/sprites/items/jetpack.cpp source/sprites/items/parachute.hpp source/sprites/items/parachute.cpp source/sprites/items/rope_pile.hpp source/sprites/items/rope_pile.cpp source/sprites/items/bomb_bag.hpp source/sprites/items/bomb_bag.cpp source/sprites/items/bomb_box.hpp source/sprites/items/bomb_box.cpp source/sprites/animations/flame.hpp source/sprites/animations/flame_element.cpp source/sprites/animations/flame.cpp source/sprites/animations/flame_element.hpp source/sprites/enemies/damsel.hpp source/sprites/enemies/damsel.cpp source/sprites/animations/smooch.hpp source/sprites/animations/smooch.cpp source/rooms/shops.hpp source/sprites/non_interactive/lamp.h source/sprites/non_interactive/lamp.cpp source/tiles/direction.hpp source/sprites/collectibles/collectibles_utils.hpp source/sprites/collectibles/collectibles_utils.cpp source/sprites/shopping_object.h source/sprites/non_interactive/shopping_icon.h source/sprites/non_interactive/shopping_icon.cpp source/sprites/shopping_object.cpp source/sprites/traps/arrow_trap.h source/sprites/traps/arrow_trap.cpp source/sprites/animations/blast.hpp source/sprites/animations/blast.cpp source/rooms/snake_well.hpp source/sprites/enemies/skeleton.cpp source/sprites/enemies/skeleton.hpp source/sound/sound_utils.cpp source/sprites/animations/bone.hpp source/sprites/animations/bone.cpp source/sprites/animations/skull.hpp source/sprites/animations/skull.cpp source/sprites/animations/fake_skeleton.hpp source/sprites/animations/fake_skeleton.cpp source/globals_definitions.cpp source/base_map.hpp source/sprites/sprite_utils.cpp source/sprites/sprite_utils.hpp source/tiles/level_generator.hpp source/tiles/level_generator.cpp source/sprites/simple_sprite_wrapper.h source/sprites/simple_sprite_wrapper.cpp source/tiles/populating_utils.hpp source/tiles/populating_utils.cpp source/sprites/collectibles/ruby_big.h source/sprites/collectibles/ruby_small.h source/sprites/collectibles/triple_goldbar.h  source/sprites/collectibles/triple_goldbar.cpp source/sprites/collectibles/single_goldbar.hpp source/sprites/collectibles/single_goldbar.cpp source/sprites/collectibles/ruby_small.cpp source/sprites/collectibles/ruby_big.cpp source/collisions/collisions_utils.h source/collisions/collisions_utils.cpp)

gfx/_not_used/sprites/gfx_arrow.png

@@ -274,49 +274,16 @@ void Collisions::getNeighboringTiles(MapTile *mapTiles[32][32], int xx, int yy,
 }
 
 void Collisions::bombNeighboringTiles(MapTile *mapTiles[32][32], int xx, int yy) {
-
-    //TODO Refactor
-    if (mapTiles[xx - 1][yy]->destroyable) {
-        delete mapTiles[xx - 1][yy];
-        mapTiles[xx - 1][yy] = nullptr;
-    }
-    if (mapTiles[xx + 1][yy]->destroyable) {
-        delete mapTiles[xx + 1][yy];
-        mapTiles[xx + 1][yy] = nullptr;
-    }
-    if (mapTiles[xx][yy - 1]->destroyable) {
-        delete mapTiles[xx][yy - 1];
-        mapTiles[xx][yy - 1] = nullptr;
-    }
-    if (mapTiles[xx][yy + 1]->destroyable) {
-        delete mapTiles[xx][yy + 1];
-        mapTiles[xx][yy + 1] = nullptr;
-    }
-    if (mapTiles[xx][yy]->destroyable) {
-        delete mapTiles[xx][yy];
-        mapTiles[xx][yy] = nullptr;
-    }
-    if (mapTiles[xx - 1][yy - 1]->destroyable) {
-        delete mapTiles[xx - 1][yy - 1];
-        mapTiles[xx - 1][yy - 1] = nullptr;
-    }
-    if (mapTiles[xx + 1][yy - 1]->destroyable) {
-        delete mapTiles[xx + 1][yy - 1];
-        mapTiles[xx + 1][yy - 1] = nullptr;
-    }
-    if (mapTiles[xx - 1][yy + 1]->destroyable) {
-        delete mapTiles[xx - 1][yy + 1];
-        mapTiles[xx - 1][yy + 1] = nullptr;
-    }
-    if (mapTiles[xx + 1][yy + 1]->destroyable) {
-        delete mapTiles[xx + 1][yy + 1];
-        mapTiles[xx + 1][yy + 1] = nullptr;
-    }
-    if (mapTiles[xx][yy + 2]->destroyable) {
-        delete mapTiles[xx][yy + 2];
-        mapTiles[xx][yy + 2] = nullptr;
-    }
-
+    mapTiles[xx - 1][yy]->exists = !mapTiles[xx - 1][yy]->destroyable;
+    mapTiles[xx + 1][yy]->exists = !mapTiles[xx + 1][yy]->destroyable;
+    mapTiles[xx][yy - 1]->exists = !mapTiles[xx][yy - 1]->destroyable;
+    mapTiles[xx][yy + 1]->exists = !mapTiles[xx][yy + 1]->destroyable;
+    mapTiles[xx][yy]->exists = !mapTiles[xx][yy]->destroyable;
+    mapTiles[xx - 1][yy - 1]->exists = !mapTiles[xx - 1][yy - 1]->destroyable;
+    mapTiles[xx + 1][yy - 1]->exists = !mapTiles[xx + 1][yy - 1]->destroyable;
+    mapTiles[xx - 1][yy + 1]->exists = !mapTiles[xx - 1][yy + 1]->destroyable;
+    mapTiles[xx + 1][yy + 1]->exists = !mapTiles[xx + 1][yy + 1]->destroyable;
+    mapTiles[xx][yy + 2]->exists = !mapTiles[xx][yy + 2]->destroyable;
 }
 
 bool Collisions::checkCollisionWithMainDude(int x, int y, int width, int height) {
@@ -370,3 +337,4 @@ void Collisions::getTilesOnLeftFromXY(int xx, int yy, MapTile **out_neighboringT
             out_neighboringTiles[a] = nullptr;
     }
 }
+

gfx/_not_used/sprites/gfx_blood_rock_rope_poof.png

@@ -0,0 +1,4 @@
+//
+// Created by xdbeef on 07.10.18.
+//
+

gfx/_not_used/sprites/gfx_blood_rock_rope_poof_mixed.png

@@ -0,0 +1,26 @@
+//
+// Created by xdbeef on 07.10.18.
+//
+
+#ifndef SPELUNKYDS_COLLISIONS_UTILS_H
+#define SPELUNKYDS_COLLISIONS_UTILS_H
+
+//TODO Use initializer_list instead of variadic templates, because we expect arguments of same type. C++ Primer p. 291.
+
+//!>variadic template function that recursively sets priority of a set of sprites
+
+//function to end the recursion and set the last element
+template<typename T>
+void set_existance(bool existance, T *i) {
+    i->exists = existance;
+}
+
+//this function will be called for all but the last element in the pack
+template<typename T, typename ... Param>
+void set_priority(bool existance, T *i, Param *... params) {
+    i->exists = existance;
+    set_existance(existance, params ...);
+}
+
+
+#endif //SPELUNKYDS_COLLISIONS_UTILS_H

source/collisions/collisions.cpp

@@ -31,6 +31,7 @@ void gameloop::run() {
             global::game_state->bombed = false;
             for (int a = 0; a < global::sprites.size(); a++)
                 (*global::sprites.at(a)).bottomCollision = false;
+            global::main_dude->bottomCollision = false;
         }
 
         global::camera->update();

source/collisions/collisions_utils.cpp

@@ -85,7 +85,10 @@ OAMManager::initSprite(const unsigned short pallette[], int palLen, const unsign
 //    }
 
     /* Keep track of the available tiles */
-    assert(current_oam_id_palette < SPRITE_COUNT && current_oam_id_tiles < SPRITE_COUNT);
+//    assert(current_oam_id_palette < SPRITE_COUNT && current_oam_id_tiles < SPRITE_COUNT);
+    if(!(current_oam_id_palette < SPRITE_COUNT && current_oam_id_tiles < SPRITE_COUNT))
+        printf("\n\n\nTOO MUCH SPRITES/PALETTES!");
+
     auto *spriteInfo = new SpriteInfo(); //TODO Smart pointer?
     SpriteEntry *spriteEntry = &oam->oamBuffer[current_oam_id_tiles];
 

source/collisions/collisions_utils.h

@@ -2,35 +2,36 @@
 // Created by xdbeef on 22.07.18.
 //
 
-
 #include <maxmod9.h>
 #include "../../build/soundbank.h"
 #include "../globals_declarations.hpp"
 #include "sound_utils.hpp"
 
 void sound::start_menu_music() {
-//    mmLoadEffect(SFX_MTITLE);
-//    global::menu_music_handler = mmEffect(SFX_MTITLE);
+    //probably should load it only once, on start
+    mmLoadEffect(SFX_MTITLE);
+    global::menu_music_handler = mmEffect(SFX_MTITLE);
 }
 
 void sound::stop_menu_music() {
-//    mmEffectCancel(global::menu_music_handler);
-//    mmUnloadEffect(SFX_MTITLE);
+    mmEffectCancel(global::menu_music_handler);
+    //probably should not unload, due to memory fragmentation when loading/unloading every level
+    mmUnloadEffect(SFX_MTITLE);
 }
 
 void sound::start_cave_music() {
-//    mmLoadEffect(SFX_MCAVE);
-//    global::cave_music_handler = mmEffect(SFX_MCAVE);
+    //probably should load it only once, on start
+    mmLoadEffect(SFX_MCAVE);
+    global::cave_music_handler = mmEffect(SFX_MCAVE);
 }
 
 void sound::stop_cave_music() {
-//    mmEffectCancel(global::cave_music_handler);
-//    mmUnloadEffect(SFX_MCAVE);
+    mmEffectCancel(global::cave_music_handler);
+    //probably should not unload, due to memory fragmentation when loading/unloading every level
+    mmUnloadEffect(SFX_MCAVE);
 }
 
 void sound::load_sounds() {
-
-    //TODO Unload effects when not needed, aspecially MCAVE because mostly it's not needed (memory issues)
     mmInitDefaultMem((mm_addr) soundbank_bin);
     mmLoadEffect(SFX_XJUMP);
     mmLoadEffect(SFX_XBREAK);