Renamed source/ to src/ and resources/ to res/.

2013-08-22 22:51:06 +02:00 · 2013-08-22 22:51:06 +02:00 · 4175ed5423
commit 4175ed5423
parent b9cd2f3b87
78 changed files with 4 additions and 4 deletions
--- a/resources/DejaVuSans.ttf
+++ b/resources/DejaVuSans.ttf
--- a/resources/textures/bullet.png
+++ b/resources/textures/bullet.png
--- a/resources/textures/corpse.png
+++ b/resources/textures/corpse.png
--- a/resources/textures/crosshair.png
+++ b/resources/textures/crosshair.png
--- a/resources/textures/enemy.png
+++ b/resources/textures/enemy.png
--- a/resources/textures/floor.png
+++ b/resources/textures/floor.png
--- a/resources/textures/item.png
+++ b/resources/textures/item.png
--- a/resources/textures/player.png
+++ b/resources/textures/player.png
--- a/resources/textures/shield.png
+++ b/resources/textures/shield.png
--- a/resources/textures/transparent.png
+++ b/resources/textures/transparent.png
--- a/resources/textures/wall.png
+++ b/resources/textures/wall.png
--- a/resources/yaml/assault_rifle.yaml
+++ b/resources/yaml/assault_rifle.yaml
--- a/resources/yaml/auto_shotgun.yaml
+++ b/resources/yaml/auto_shotgun.yaml
--- a/resources/yaml/bullet.yaml
+++ b/resources/yaml/bullet.yaml
--- a/resources/yaml/bullet_invisible.yaml
+++ b/resources/yaml/bullet_invisible.yaml
--- a/resources/yaml/corpse.yaml
+++ b/resources/yaml/corpse.yaml
--- a/resources/yaml/enemy.yaml
+++ b/resources/yaml/enemy.yaml
--- a/resources/yaml/hmg.yaml
+++ b/resources/yaml/hmg.yaml
--- a/resources/yaml/knife.yaml
+++ b/resources/yaml/knife.yaml
--- a/resources/yaml/pistol.yaml
+++ b/resources/yaml/pistol.yaml
--- a/resources/yaml/player.yaml
+++ b/resources/yaml/player.yaml
--- a/resources/yaml/rifle.yaml
+++ b/resources/yaml/rifle.yaml
--- a/resources/yaml/rotating_shield.yaml
+++ b/resources/yaml/rotating_shield.yaml
--- a/resources/yaml/shotgun.yaml
+++ b/resources/yaml/shotgun.yaml
--- a/resources/yaml/tile_floor.yaml
+++ b/resources/yaml/tile_floor.yaml
--- a/resources/yaml/tile_wall.yaml
+++ b/resources/yaml/tile_wall.yaml
--- a/source/Game.cpp
+++ b/source/Game.cpp
--- a/source/Game.h
+++ b/source/Game.h
--- a/source/Pathfinder.cpp
+++ b/source/Pathfinder.cpp
--- a/source/Pathfinder.h
+++ b/source/Pathfinder.h
--- a/source/World.cpp
+++ b/source/World.cpp
--- a/source/World.h
+++ b/source/World.h
--- a/source/abstract/Character.cpp
+++ b/source/abstract/Character.cpp
--- a/source/abstract/Character.h
+++ b/source/abstract/Character.h
--- a/source/abstract/Circle.cpp
+++ b/source/abstract/Circle.cpp
--- a/source/abstract/Circle.h
+++ b/source/abstract/Circle.h
--- a/source/abstract/CollisionModel.cpp
+++ b/source/abstract/CollisionModel.cpp
--- a/source/abstract/CollisionModel.h
+++ b/source/abstract/CollisionModel.h
--- a/source/abstract/Rectangle.cpp
+++ b/source/abstract/Rectangle.cpp
--- a/source/abstract/Rectangle.h
+++ b/source/abstract/Rectangle.h
--- a/source/abstract/Singleton.h
+++ b/source/abstract/Singleton.h
--- a/source/abstract/Sprite.cpp
+++ b/source/abstract/Sprite.cpp
--- a/source/abstract/Sprite.h
+++ b/source/abstract/Sprite.h
--- a/source/effects/Bullet.cpp
+++ b/source/effects/Bullet.cpp
--- a/source/effects/Bullet.h
+++ b/source/effects/Bullet.h
--- a/source/generator/Generator.cpp
+++ b/source/generator/Generator.cpp
--- a/source/generator/Generator.h
+++ b/source/generator/Generator.h
--- a/source/generator/SimplexNoise.cpp
+++ b/source/generator/SimplexNoise.cpp
--- a/source/generator/SimplexNoise.h
+++ b/source/generator/SimplexNoise.h
--- a/source/items/Gadget.cpp
+++ b/source/items/Gadget.cpp
--- a/source/items/Gadget.h
+++ b/source/items/Gadget.h
--- a/source/items/Heal.cpp
+++ b/source/items/Heal.cpp
--- a/source/items/Heal.h
+++ b/source/items/Heal.h
--- a/source/items/Item.cpp
+++ b/source/items/Item.cpp
--- a/source/items/Item.h
+++ b/source/items/Item.h
--- a/source/items/Shield.cpp
+++ b/source/items/Shield.cpp
--- a/source/items/Shield.h
+++ b/source/items/Shield.h
--- a/source/items/Weapon.cpp
+++ b/source/items/Weapon.cpp
--- a/source/items/Weapon.h
+++ b/source/items/Weapon.h
--- a/source/main.cpp
+++ b/source/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<sf::Texture>("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);

--- a/source/sprites/Corpse.cpp
+++ b/source/sprites/Corpse.cpp
--- a/source/sprites/Corpse.h
+++ b/source/sprites/Corpse.h
--- a/source/sprites/Enemy.cpp
+++ b/source/sprites/Enemy.cpp
--- a/source/sprites/Enemy.h
+++ b/source/sprites/Enemy.h
--- a/source/sprites/Player.cpp
+++ b/source/sprites/Player.cpp
--- a/source/sprites/Player.h
+++ b/source/sprites/Player.h
--- a/source/sprites/RotatingShield.cpp
+++ b/source/sprites/RotatingShield.cpp
--- a/source/sprites/RotatingShield.h
+++ b/source/sprites/RotatingShield.h
--- a/source/sprites/Tile.cpp
+++ b/source/sprites/Tile.cpp
--- a/source/sprites/Tile.h
+++ b/source/sprites/Tile.h
--- a/source/util/Interval.cpp
+++ b/source/util/Interval.cpp
--- a/source/util/Interval.h
+++ b/source/util/Interval.h
--- a/source/util/Loader.h
+++ b/source/util/Loader.h
--- a/source/util/Log.h
+++ b/source/util/Log.h
--- a/source/util/ResourceManager.h
+++ b/source/util/ResourceManager.h
--- a/source/util/Vector.h
+++ b/source/util/Vector.h
--- a/source/util/Yaml.cpp
+++ b/source/util/Yaml.cpp
--- a/source/util/Yaml.h
+++ b/source/util/Yaml.h