36 files changed, 34 insertions, 37 deletions

diff --git a/data/core/graphics/images/char_wallpaper.png b/data/core/graphics/images/char_wallpaper.png
deleted file mode 100644
index 53f8ff10..00000000
--- a/data/core/graphics/images/char_wallpaper.png
+++ /dev/null
diff --git a/data/core/graphics/gui/bg_quad_dis.png b/data/graphics/gui/bg_quad_dis.png
index 3a0354bb..3a0354bb 100644
--- a/data/core/graphics/gui/bg_quad_dis.png
+++ b/data/graphics/gui/bg_quad_dis.png
diff --git a/data/core/graphics/gui/button.png b/data/graphics/gui/button.png
index 9ebbea63..9ebbea63 100644
--- a/data/core/graphics/gui/button.png
+++ b/data/graphics/gui/button.png
diff --git a/data/core/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png
index 0ce3aa6f..0ce3aa6f 100644
--- a/data/core/graphics/gui/button_disabled.png
+++ b/data/graphics/gui/button_disabled.png
diff --git a/data/core/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png
index c4772634..c4772634 100644
--- a/data/core/graphics/gui/buttonhi.png
+++ b/data/graphics/gui/buttonhi.png
diff --git a/data/core/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png
index e9cd1765..e9cd1765 100644
--- a/data/core/graphics/gui/buttonpress.png
+++ b/data/graphics/gui/buttonpress.png
diff --git a/data/core/graphics/gui/checkbox.png b/data/graphics/gui/checkbox.png
index 669ecf03..669ecf03 100644
--- a/data/core/graphics/gui/checkbox.png
+++ b/data/graphics/gui/checkbox.png
diff --git a/data/core/graphics/gui/fixedfont.png b/data/graphics/gui/fixedfont.png
index 6c3f032c..6c3f032c 100644
--- a/data/core/graphics/gui/fixedfont.png
+++ b/data/graphics/gui/fixedfont.png
diff --git a/data/core/graphics/gui/mouse.png b/data/graphics/gui/mouse.png
index e6a84021..e6a84021 100644
--- a/data/core/graphics/gui/mouse.png
+++ b/data/graphics/gui/mouse.png
diff --git a/data/core/graphics/gui/radioin.png b/data/graphics/gui/radioin.png
index 12e027fe..12e027fe 100644
--- a/data/core/graphics/gui/radioin.png
+++ b/data/graphics/gui/radioin.png
diff --git a/data/core/graphics/gui/radioout.png b/data/graphics/gui/radioout.png
index 5eb67bd8..5eb67bd8 100644
--- a/data/core/graphics/gui/radioout.png
+++ b/data/graphics/gui/radioout.png
diff --git a/data/core/graphics/gui/slider.png b/data/graphics/gui/slider.png
index 405bd491..405bd491 100644
--- a/data/core/graphics/gui/slider.png
+++ b/data/graphics/gui/slider.png
diff --git a/data/core/graphics/gui/textbox.png b/data/graphics/gui/textbox.png
index ccfb2bb1..ccfb2bb1 100644
--- a/data/core/graphics/gui/textbox.png
+++ b/data/graphics/gui/textbox.png
diff --git a/data/graphics/gui/thickborder.png b/data/graphics/gui/thickborder.png
new file mode 100644
index 00000000..7fabe49c
--- /dev/null
+++ b/data/graphics/gui/thickborder.png
diff --git a/data/core/graphics/gui/vscroll_blue.png b/data/graphics/gui/vscroll_blue.png
index aa236883..aa236883 100644
--- a/data/core/graphics/gui/vscroll_blue.png
+++ b/data/graphics/gui/vscroll_blue.png
diff --git a/data/core/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png
index 6bb6bc3f..6bb6bc3f 100644
--- a/data/core/graphics/gui/vscroll_grey.png
+++ b/data/graphics/gui/vscroll_grey.png
diff --git a/data/core/graphics/gui/vscroll_red.png b/data/graphics/gui/vscroll_red.png
index aadf6925..aadf6925 100644
--- a/data/core/graphics/gui/vscroll_red.png
+++ b/data/graphics/gui/vscroll_red.png
diff --git a/data/core/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 03a98db3..03a98db3 100644
--- a/data/core/graphics/images/login_wallpaper.png
+++ b/data/graphics/images/login_wallpaper.png
diff --git a/src/being.cpp b/src/being.cpp
index 2fcd9367..687cd5a3 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -148,7 +148,8 @@ void Being::setSpeech(const std::string &text, int time)
 
 void Being::nextStep()
 {
-    if (!path.empty()) {
+    if (!path.empty())
+    {
         PATH_NODE node = path.front();
         path.pop_front();
 
diff --git a/src/engine.cpp b/src/engine.cpp
index b03dbf38..48aa9d31 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -193,15 +193,15 @@ Engine::Engine()
     // Load the sprite sets
     ResourceManager *resman = ResourceManager::getInstance();
     Image *npcbmp = resman->getImage(
-            "core/graphics/sprites/npcs.png");
+            "graphics/sprites/npcs.png");
     Image *emotionbmp = resman->getImage(
-            "core/graphics/sprites/emotions.png");
+            "graphics/sprites/emotions.png");
     Image *monsterbitmap = resman->getImage(
-            "core/graphics/sprites/monsters.png");
+            "graphics/sprites/monsters.png");
     Image *weaponbitmap = resman->getImage(
-            "core/graphics/sprites/weapons.png");
+            "graphics/sprites/weapons.png");
     Image *itembitmap = resman->getImage(
-            "core/graphics/sprites/items.png", IMG_ALPHA);
+            "graphics/sprites/items.png", IMG_ALPHA);
 
     if (!npcbmp) logger.error("Unable to load npcs.png");
     if (!emotionbmp) logger.error("Unable to load emotions.png");
diff --git a/src/graphics.cpp b/src/graphics.cpp
index ecea7bbd..88ba744a 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -43,7 +43,7 @@ Graphics::Graphics():
 
     // Load the mouse cursor
     ResourceManager *resman = ResourceManager::getInstance();
-    mouseCursor = resman->getImage("core/graphics/gui/mouse.png", IMG_ALPHA);
+    mouseCursor = resman->getImage("graphics/gui/mouse.png", IMG_ALPHA);
     if (!mouseCursor) {
         logger.error("Unable to load mouse cursor.");
     }
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index fb1a01ec..195fde69 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -32,10 +32,10 @@ Button::Button(const std::string& caption):
     // Load the skin
     ResourceManager *resman = ResourceManager::getInstance();
     Image *btn[4];
-    btn[0] = resman->getImage("core/graphics/gui/button.png");
-    btn[1] = resman->getImage("core/graphics/gui/buttonhi.png");
-    btn[2] = resman->getImage("core/graphics/gui/buttonpress.png");
-    btn[3] = resman->getImage("core/graphics/gui/button_disabled.png");
+    btn[0] = resman->getImage("graphics/gui/button.png");
+    btn[1] = resman->getImage("graphics/gui/buttonhi.png");
+    btn[2] = resman->getImage("graphics/gui/buttonpress.png");
+    btn[3] = resman->getImage("graphics/gui/button_disabled.png");
     int bgridx[4] = {0, 9, 16, 25};
     int bgridy[4] = {0, 4, 19, 24};
     int a, x, y;
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 4b8a9099..d8071ac2 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -104,10 +104,6 @@ CharSelectDialog::CharSelectDialog():
 
     selectButton->requestFocus();
     setLocationRelativeTo(getParent());
-    
-    ResourceManager *resman = ResourceManager::getInstance();
-    login_wallpaper = resman->getImage(
-            "core/graphics/images/char_wallpaper.png");
 }
 
 CharSelectDialog::~CharSelectDialog()
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index b231ec64..68966376 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -29,7 +29,7 @@ CheckBox::CheckBox(const std::string& caption, bool marked):
     gcn::CheckBox(caption, marked)
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *checkBox = resman->getImage("core/graphics/gui/checkbox.png");
+    Image *checkBox = resman->getImage("graphics/gui/checkbox.png");
     checkBoxNormal = checkBox->getSubImage(0, 0, 9, 10);
     checkBoxChecked = checkBox->getSubImage(9, 0, 9, 10);
     checkBoxDisabled = checkBox->getSubImage(18, 0, 9, 10);
diff --git a/src/gui/equipment.cpp b/src/gui/equipment.cpp
index 7d0ec083..a29c137f 100644
--- a/src/gui/equipment.cpp
+++ b/src/gui/equipment.cpp
@@ -34,7 +34,7 @@ EquipmentWindow::EquipmentWindow():
     setPosition(40, 40);
     
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *itemImg = resman->getImage("core/graphics/sprites/items.png", IMG_ALPHA);
+    Image *itemImg = resman->getImage("graphics/sprites/items.png", IMG_ALPHA);
     if (!itemImg) logger.error("Unable to load items.png");
     itemset = new Spriteset(itemImg, 20, 20);
     
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 1cb7e3f9..99514e9e 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -62,7 +62,7 @@ Gui::Gui(Graphics *graphics)
     setTop(guiTop);
 
     // Set global font
-    guiFont = new gcn::ImageFont("./data/core/graphics/gui/fixedfont.png",
+    guiFont = new gcn::ImageFont("data/graphics/gui/fixedfont.png",
             " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:@"
             "!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`"
             );
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 1b000127..3ee6bfb4 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -30,7 +30,7 @@
 ItemContainer::ItemContainer()
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *itemImg = resman->getImage("core/graphics/sprites/items.png", IMG_ALPHA);
+    Image *itemImg = resman->getImage("graphics/sprites/items.png", IMG_ALPHA);
     if (!itemImg) logger.error("Unable to load items.png");
     itemset = new Spriteset(itemImg, 20, 20);
 
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 09691b82..ffabe057 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -35,7 +35,7 @@ PlayerBox::PlayerBox():
 
     // Load the background skin
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *textbox = resman->getImage("core/graphics/gui/textbox.png");
+    Image *textbox = resman->getImage("graphics/gui/textbox.png");
     int bggridx[4] = {0, 9, 16, 25};
     int bggridy[4] = {0, 4, 19, 24};
     int a = 0, x, y;
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 178f7d30..8b051cbb 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -38,8 +38,8 @@ ProgressBar::ProgressBar(float progress, int x, int y, int width, int height,
     
     // Load dialog title bar image
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *dBorders = resman->getImage("core/graphics/gui/vscroll_grey.png");
-    dBackground = resman->getImage("core/graphics/gui/bg_quad_dis.png");
+    Image *dBorders = resman->getImage("graphics/gui/vscroll_grey.png");
+    dBackground = resman->getImage("graphics/gui/bg_quad_dis.png");
 
     dTopBorder = dBorders->getSubImage(4, 0, 3, 4);
     dLeftBorder = dBorders->getSubImage(0, 4, 4, 10);
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index a7115752..d04d8586 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -29,10 +29,10 @@ RadioButton::RadioButton(const std::string& caption, const std::string& group,
     gcn::RadioButton(caption, group, marked)
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    radioNormal = resman->getImage("core/graphics/gui/radioout.png");
-    radioChecked = resman->getImage("core/graphics/gui/radioin.png");
-    radioDisabled = resman->getImage("core/graphics/gui/radioout.png");
-    radioDisabledChecked = resman->getImage("core/graphics/gui/radioin.png");
+    radioNormal = resman->getImage("graphics/gui/radioout.png");
+    radioChecked = resman->getImage("graphics/gui/radioin.png");
+    radioDisabled = resman->getImage("graphics/gui/radioout.png");
+    radioDisabledChecked = resman->getImage("graphics/gui/radioin.png");
 }
 
 void RadioButton::drawBox(gcn::Graphics* graphics)
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index d262d355..fc1f38d3 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -43,7 +43,7 @@ void ScrollArea::init()
 
     // Load the background skin
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *textbox = resman->getImage("core/graphics/gui/textbox.png");
+    Image *textbox = resman->getImage("graphics/gui/textbox.png");
     int bggridx[4] = {0, 9, 16, 25};
     int bggridy[4] = {0, 4, 19, 24};
     int a = 0, x, y;
@@ -59,7 +59,7 @@ void ScrollArea::init()
     }
 
     // Load vertical scrollbar skin
-    Image *vscroll = resman->getImage("core/graphics/gui/vscroll_grey.png");
+    Image *vscroll = resman->getImage("graphics/gui/vscroll_grey.png");
     int vsgridx[4] = {0, 4, 7, 11};
     int vsgridy[4] = {0, 4, 15, 19};
     a = 0;
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index eb7ac1aa..85fcf2d7 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -44,7 +44,7 @@ void Slider::init()
 
     // Load resources
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *slider = resman->getImage("core/graphics/gui/slider.png");
+    Image *slider = resman->getImage("graphics/gui/slider.png");
 
     x = 0; y = 0;
     w = 15; h = 6;
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index c2b4642c..56ad8ab0 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -31,7 +31,7 @@ TextField::TextField(const std::string& text):
 
     // Load the skin
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *textbox = resman->getImage("core/graphics/gui/textbox.png");
+    Image *textbox = resman->getImage("graphics/gui/textbox.png");
     int gridx[4] = {0, 9, 16, 25};
     int gridy[4] = {0, 4, 19, 24};
     int a = 0, x, y;
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 817090ca..ac869fab 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -41,14 +41,14 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 
     // Load dialog title bar image
     ResourceManager *resman = ResourceManager::getInstance();
-    dBorders = resman->getImage("core/graphics/gui/vscroll_grey.png");
-    dBackground = resman->getImage("core/graphics/gui/bg_quad_dis.png");
+    dBorders = resman->getImage("graphics/gui/vscroll_grey.png");
+    dBackground = resman->getImage("graphics/gui/bg_quad_dis.png");
 
     border.grid[0] = dBorders->getSubImage(0, 0, 4, 4);
     border.grid[1] = dBorders->getSubImage(4, 0, 3, 4);
     border.grid[2] = dBorders->getSubImage(7, 0, 4, 4);
     border.grid[3] = dBorders->getSubImage(0, 4, 4, 10);
-    border.grid[4] = resman->getImage("core/graphics/gui/bg_quad_dis.png");
+    border.grid[4] = resman->getImage("graphics/gui/bg_quad_dis.png");
     border.grid[5] = dBorders->getSubImage(7, 4, 4, 10);
     border.grid[6] = dBorders->getSubImage(0, 15, 4, 4);
     border.grid[7] = dBorders->getSubImage(4, 15, 3, 4);
diff --git a/src/main.cpp b/src/main.cpp
index 2383ec96..b7518ac5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -263,11 +263,11 @@ void init_engine()
     ResourceManager *resman = ResourceManager::getInstance();
 
     login_wallpaper = resman->getImage(
-            "core/graphics/images/login_wallpaper.png");
+            "graphics/images/login_wallpaper.png");
     Image *playerImg = resman->getImage(
-            "core/graphics/sprites/player_male_base.png");
+            "graphics/sprites/player_male_base.png");
     Image *hairImg = resman->getImage(
-            "core/graphics/sprites/player_male_hair.png");
+            "graphics/sprites/player_male_hair.png");
 
     if (!login_wallpaper) logger.error("Couldn't load login_wallpaper.png");
     if (!playerImg) logger.error("Couldn't load player_male_base.png");
diff --git a/src/map.cpp b/src/map.cpp
index c51b479e..60190f6f 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -133,7 +133,7 @@ Map *Map::load(const std::string &mapFile)
 
     // Load the default tileset
     ResourceManager *resman = ResourceManager::getInstance();
-    Image *tilesetbmp = resman->getImage("core/graphics/tiles/desert.png");
+    Image *tilesetbmp = resman->getImage("graphics/tiles/desert.png");
     if (!tilesetbmp) logger.error("Unable to load desert.png");
     Spriteset *tileset = new Spriteset(tilesetbmp, 32, 32);