diff --git a/resources/DejaVuSans.ttf b/res/DejaVuSans.ttf similarity index 100% rename from resources/DejaVuSans.ttf rename to res/DejaVuSans.ttf diff --git a/resources/textures/bullet.png b/res/textures/bullet.png similarity index 100% rename from resources/textures/bullet.png rename to res/textures/bullet.png diff --git a/resources/textures/corpse.png b/res/textures/corpse.png similarity index 100% rename from resources/textures/corpse.png rename to res/textures/corpse.png diff --git a/resources/textures/crosshair.png b/res/textures/crosshair.png similarity index 100% rename from resources/textures/crosshair.png rename to res/textures/crosshair.png diff --git a/resources/textures/enemy.png b/res/textures/enemy.png similarity index 100% rename from resources/textures/enemy.png rename to res/textures/enemy.png diff --git a/resources/textures/floor.png b/res/textures/floor.png similarity index 100% rename from resources/textures/floor.png rename to res/textures/floor.png diff --git a/resources/textures/item.png b/res/textures/item.png similarity index 100% rename from resources/textures/item.png rename to res/textures/item.png diff --git a/resources/textures/player.png b/res/textures/player.png similarity index 100% rename from resources/textures/player.png rename to res/textures/player.png diff --git a/resources/textures/shield.png b/res/textures/shield.png similarity index 100% rename from resources/textures/shield.png rename to res/textures/shield.png diff --git a/resources/textures/transparent.png b/res/textures/transparent.png similarity index 100% rename from resources/textures/transparent.png rename to res/textures/transparent.png diff --git a/resources/textures/wall.png b/res/textures/wall.png similarity index 100% rename from resources/textures/wall.png rename to res/textures/wall.png diff --git a/resources/yaml/assault_rifle.yaml b/res/yaml/assault_rifle.yaml similarity index 100% rename from resources/yaml/assault_rifle.yaml rename to res/yaml/assault_rifle.yaml diff --git a/resources/yaml/auto_shotgun.yaml b/res/yaml/auto_shotgun.yaml similarity index 100% rename from resources/yaml/auto_shotgun.yaml rename to res/yaml/auto_shotgun.yaml diff --git a/resources/yaml/bullet.yaml b/res/yaml/bullet.yaml similarity index 100% rename from resources/yaml/bullet.yaml rename to res/yaml/bullet.yaml diff --git a/resources/yaml/bullet_invisible.yaml b/res/yaml/bullet_invisible.yaml similarity index 100% rename from resources/yaml/bullet_invisible.yaml rename to res/yaml/bullet_invisible.yaml diff --git a/resources/yaml/corpse.yaml b/res/yaml/corpse.yaml similarity index 100% rename from resources/yaml/corpse.yaml rename to res/yaml/corpse.yaml diff --git a/resources/yaml/enemy.yaml b/res/yaml/enemy.yaml similarity index 100% rename from resources/yaml/enemy.yaml rename to res/yaml/enemy.yaml diff --git a/resources/yaml/hmg.yaml b/res/yaml/hmg.yaml similarity index 100% rename from resources/yaml/hmg.yaml rename to res/yaml/hmg.yaml diff --git a/resources/yaml/knife.yaml b/res/yaml/knife.yaml similarity index 100% rename from resources/yaml/knife.yaml rename to res/yaml/knife.yaml diff --git a/resources/yaml/pistol.yaml b/res/yaml/pistol.yaml similarity index 100% rename from resources/yaml/pistol.yaml rename to res/yaml/pistol.yaml diff --git a/resources/yaml/player.yaml b/res/yaml/player.yaml similarity index 100% rename from resources/yaml/player.yaml rename to res/yaml/player.yaml diff --git a/resources/yaml/rifle.yaml b/res/yaml/rifle.yaml similarity index 100% rename from resources/yaml/rifle.yaml rename to res/yaml/rifle.yaml diff --git a/resources/yaml/rotating_shield.yaml b/res/yaml/rotating_shield.yaml similarity index 100% rename from resources/yaml/rotating_shield.yaml rename to res/yaml/rotating_shield.yaml diff --git a/resources/yaml/shotgun.yaml b/res/yaml/shotgun.yaml similarity index 100% rename from resources/yaml/shotgun.yaml rename to res/yaml/shotgun.yaml diff --git a/resources/yaml/tile_floor.yaml b/res/yaml/tile_floor.yaml similarity index 100% rename from resources/yaml/tile_floor.yaml rename to res/yaml/tile_floor.yaml diff --git a/resources/yaml/tile_wall.yaml b/res/yaml/tile_wall.yaml similarity index 100% rename from resources/yaml/tile_wall.yaml rename to res/yaml/tile_wall.yaml diff --git a/source/Game.cpp b/src/Game.cpp similarity index 100% rename from source/Game.cpp rename to src/Game.cpp diff --git a/source/Game.h b/src/Game.h similarity index 100% rename from source/Game.h rename to src/Game.h diff --git a/source/Pathfinder.cpp b/src/Pathfinder.cpp similarity index 100% rename from source/Pathfinder.cpp rename to src/Pathfinder.cpp diff --git a/source/Pathfinder.h b/src/Pathfinder.h similarity index 100% rename from source/Pathfinder.h rename to src/Pathfinder.h diff --git a/source/World.cpp b/src/World.cpp similarity index 100% rename from source/World.cpp rename to src/World.cpp diff --git a/source/World.h b/src/World.h similarity index 100% rename from source/World.h rename to src/World.h diff --git a/source/abstract/Character.cpp b/src/abstract/Character.cpp similarity index 100% rename from source/abstract/Character.cpp rename to src/abstract/Character.cpp diff --git a/source/abstract/Character.h b/src/abstract/Character.h similarity index 100% rename from source/abstract/Character.h rename to src/abstract/Character.h diff --git a/source/abstract/Circle.cpp b/src/abstract/Circle.cpp similarity index 100% rename from source/abstract/Circle.cpp rename to src/abstract/Circle.cpp diff --git a/source/abstract/Circle.h b/src/abstract/Circle.h similarity index 100% rename from source/abstract/Circle.h rename to src/abstract/Circle.h diff --git a/source/abstract/CollisionModel.cpp b/src/abstract/CollisionModel.cpp similarity index 100% rename from source/abstract/CollisionModel.cpp rename to src/abstract/CollisionModel.cpp diff --git a/source/abstract/CollisionModel.h b/src/abstract/CollisionModel.h similarity index 100% rename from source/abstract/CollisionModel.h rename to src/abstract/CollisionModel.h diff --git a/source/abstract/Rectangle.cpp b/src/abstract/Rectangle.cpp similarity index 100% rename from source/abstract/Rectangle.cpp rename to src/abstract/Rectangle.cpp diff --git a/source/abstract/Rectangle.h b/src/abstract/Rectangle.h similarity index 100% rename from source/abstract/Rectangle.h rename to src/abstract/Rectangle.h diff --git a/source/abstract/Singleton.h b/src/abstract/Singleton.h similarity index 100% rename from source/abstract/Singleton.h rename to src/abstract/Singleton.h diff --git a/source/abstract/Sprite.cpp b/src/abstract/Sprite.cpp similarity index 100% rename from source/abstract/Sprite.cpp rename to src/abstract/Sprite.cpp diff --git a/source/abstract/Sprite.h b/src/abstract/Sprite.h similarity index 100% rename from source/abstract/Sprite.h rename to src/abstract/Sprite.h diff --git a/source/effects/Bullet.cpp b/src/effects/Bullet.cpp similarity index 100% rename from source/effects/Bullet.cpp rename to src/effects/Bullet.cpp diff --git a/source/effects/Bullet.h b/src/effects/Bullet.h similarity index 100% rename from source/effects/Bullet.h rename to src/effects/Bullet.h diff --git a/source/generator/Generator.cpp b/src/generator/Generator.cpp similarity index 100% rename from source/generator/Generator.cpp rename to src/generator/Generator.cpp diff --git a/source/generator/Generator.h b/src/generator/Generator.h similarity index 100% rename from source/generator/Generator.h rename to src/generator/Generator.h diff --git a/source/generator/SimplexNoise.cpp b/src/generator/SimplexNoise.cpp similarity index 100% rename from source/generator/SimplexNoise.cpp rename to src/generator/SimplexNoise.cpp diff --git a/source/generator/SimplexNoise.h b/src/generator/SimplexNoise.h similarity index 100% rename from source/generator/SimplexNoise.h rename to src/generator/SimplexNoise.h diff --git a/source/items/Gadget.cpp b/src/items/Gadget.cpp similarity index 100% rename from source/items/Gadget.cpp rename to src/items/Gadget.cpp diff --git a/source/items/Gadget.h b/src/items/Gadget.h similarity index 100% rename from source/items/Gadget.h rename to src/items/Gadget.h diff --git a/source/items/Heal.cpp b/src/items/Heal.cpp similarity index 100% rename from source/items/Heal.cpp rename to src/items/Heal.cpp diff --git a/source/items/Heal.h b/src/items/Heal.h similarity index 100% rename from source/items/Heal.h rename to src/items/Heal.h diff --git a/source/items/Item.cpp b/src/items/Item.cpp similarity index 100% rename from source/items/Item.cpp rename to src/items/Item.cpp diff --git a/source/items/Item.h b/src/items/Item.h similarity index 100% rename from source/items/Item.h rename to src/items/Item.h diff --git a/source/items/Shield.cpp b/src/items/Shield.cpp similarity index 100% rename from source/items/Shield.cpp rename to src/items/Shield.cpp diff --git a/source/items/Shield.h b/src/items/Shield.h similarity index 100% rename from source/items/Shield.h rename to src/items/Shield.h diff --git a/source/items/Weapon.cpp b/src/items/Weapon.cpp similarity index 100% rename from source/items/Weapon.cpp rename to src/items/Weapon.cpp diff --git a/source/items/Weapon.h b/src/items/Weapon.h similarity index 100% rename from source/items/Weapon.h rename to src/items/Weapon.h diff --git a/source/main.cpp b/src/main.cpp similarity index 65% rename from source/main.cpp rename to src/main.cpp index 73e76bc..a171d7f 100644 --- a/source/main.cpp +++ b/src/main.cpp @@ -14,16 +14,16 @@ * Creates Game object. */ int main(int argc, char* argv[]) { - Yaml::setFolder("resources/yaml/"); + Yaml::setFolder("res/yaml/"); - Loader::i().setFolder("resources/"); + Loader::i().setFolder("res/"); Loader::i().setSubFolder("textures/"); tgui::Window window(sf::VideoMode(800, 600, 32), "Dungeon Gunner", sf::Style::Close | sf::Style::Titlebar); - if (!window.globalFont.loadFromFile("resources/DejaVuSans.ttf")) - LOG_W("Failed to load font at 'resources/DejaVuSans.ttf'"); + if (!window.globalFont.loadFromFile("res/DejaVuSans.ttf")) + LOG_W("Failed to load font at 'res/DejaVuSans.ttf'"); Game game(window); diff --git a/source/sprites/Corpse.cpp b/src/sprites/Corpse.cpp similarity index 100% rename from source/sprites/Corpse.cpp rename to src/sprites/Corpse.cpp diff --git a/source/sprites/Corpse.h b/src/sprites/Corpse.h similarity index 100% rename from source/sprites/Corpse.h rename to src/sprites/Corpse.h diff --git a/source/sprites/Enemy.cpp b/src/sprites/Enemy.cpp similarity index 100% rename from source/sprites/Enemy.cpp rename to src/sprites/Enemy.cpp diff --git a/source/sprites/Enemy.h b/src/sprites/Enemy.h similarity index 100% rename from source/sprites/Enemy.h rename to src/sprites/Enemy.h diff --git a/source/sprites/Player.cpp b/src/sprites/Player.cpp similarity index 100% rename from source/sprites/Player.cpp rename to src/sprites/Player.cpp diff --git a/source/sprites/Player.h b/src/sprites/Player.h similarity index 100% rename from source/sprites/Player.h rename to src/sprites/Player.h diff --git a/source/sprites/RotatingShield.cpp b/src/sprites/RotatingShield.cpp similarity index 100% rename from source/sprites/RotatingShield.cpp rename to src/sprites/RotatingShield.cpp diff --git a/source/sprites/RotatingShield.h b/src/sprites/RotatingShield.h similarity index 100% rename from source/sprites/RotatingShield.h rename to src/sprites/RotatingShield.h diff --git a/source/sprites/Tile.cpp b/src/sprites/Tile.cpp similarity index 100% rename from source/sprites/Tile.cpp rename to src/sprites/Tile.cpp diff --git a/source/sprites/Tile.h b/src/sprites/Tile.h similarity index 100% rename from source/sprites/Tile.h rename to src/sprites/Tile.h diff --git a/source/util/Interval.cpp b/src/util/Interval.cpp similarity index 100% rename from source/util/Interval.cpp rename to src/util/Interval.cpp diff --git a/source/util/Interval.h b/src/util/Interval.h similarity index 100% rename from source/util/Interval.h rename to src/util/Interval.h diff --git a/source/util/Loader.h b/src/util/Loader.h similarity index 100% rename from source/util/Loader.h rename to src/util/Loader.h diff --git a/source/util/Log.h b/src/util/Log.h similarity index 100% rename from source/util/Log.h rename to src/util/Log.h diff --git a/source/util/ResourceManager.h b/src/util/ResourceManager.h similarity index 100% rename from source/util/ResourceManager.h rename to src/util/ResourceManager.h diff --git a/source/util/Vector.h b/src/util/Vector.h similarity index 100% rename from source/util/Vector.h rename to src/util/Vector.h diff --git a/source/util/Yaml.cpp b/src/util/Yaml.cpp similarity index 100% rename from source/util/Yaml.cpp rename to src/util/Yaml.cpp diff --git a/source/util/Yaml.h b/src/util/Yaml.h similarity index 100% rename from source/util/Yaml.h rename to src/util/Yaml.h