diff --git a/bin b/bin index c653980..a788d99 160000 --- a/bin +++ b/bin @@ -1 +1 @@ -Subproject commit c65398019329fe3d28670cd57f84461b48082642 +Subproject commit a788d998fa1815c9fa1ff5a8914a46f2ce5545ff diff --git a/client/scenes/world.cpp b/client/scenes/world.cpp index 42b84f8..6a8a7b0 100644 --- a/client/scenes/world.cpp +++ b/client/scenes/world.cpp @@ -116,8 +116,8 @@ World::World(int* const argClientIndex, int* const argAccountIndex): "slot 7 red.png", "slot 8 red.png" }; - barrierMgr.LoadBaseImage(GetRenderer(), config["dir.sprites"] + "/barrier/base.png"); - barrierMgr.LoadTemplateImages(GetRenderer(), config["dir.sprites"] + "/barrier/", slotNames); + barrierMgr.LoadBaseImage(GetRenderer(), config["dir.sprites"] + "barrier/base.png"); + barrierMgr.LoadTemplateImages(GetRenderer(), config["dir.sprites"] + "barrier/", slotNames); std::cout << "Templates loaded: " << barrierMgr.GetTemplateContainer()->size() << std::endl; } diff --git a/rsc/graphics/sprites/Barrier/Visible #1.png b/rsc/graphics/sprites/Barrier/Visible #1.png deleted file mode 100644 index 54ecbbb..0000000 Binary files a/rsc/graphics/sprites/Barrier/Visible #1.png and /dev/null differ diff --git a/rsc/graphics/sprites/Barrier/barrier template.xcf b/rsc/graphics/sprites/barrier/barrier template.xcf similarity index 80% rename from rsc/graphics/sprites/Barrier/barrier template.xcf rename to rsc/graphics/sprites/barrier/barrier template.xcf index 9938fa6..71bac7d 100644 Binary files a/rsc/graphics/sprites/Barrier/barrier template.xcf and b/rsc/graphics/sprites/barrier/barrier template.xcf differ diff --git a/rsc/graphics/sprites/Barrier/Base.png b/rsc/graphics/sprites/barrier/base.png similarity index 91% rename from rsc/graphics/sprites/Barrier/Base.png rename to rsc/graphics/sprites/barrier/base.png index 68376b5..07175fd 100644 Binary files a/rsc/graphics/sprites/Barrier/Base.png and b/rsc/graphics/sprites/barrier/base.png differ diff --git a/rsc/graphics/sprites/Barrier/Colored.png b/rsc/graphics/sprites/barrier/colored.png similarity index 91% rename from rsc/graphics/sprites/Barrier/Colored.png rename to rsc/graphics/sprites/barrier/colored.png index 0f1c9b0..3a0ae05 100644 Binary files a/rsc/graphics/sprites/Barrier/Colored.png and b/rsc/graphics/sprites/barrier/colored.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 1 Green.png b/rsc/graphics/sprites/barrier/slot 1 green.png similarity index 76% rename from rsc/graphics/sprites/Barrier/Slot 1 Green.png rename to rsc/graphics/sprites/barrier/slot 1 green.png index 9e26089..879de76 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 1 Green.png and b/rsc/graphics/sprites/barrier/slot 1 green.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 1 Red.png b/rsc/graphics/sprites/barrier/slot 1 red.png similarity index 76% rename from rsc/graphics/sprites/Barrier/Slot 1 Red.png rename to rsc/graphics/sprites/barrier/slot 1 red.png index 3049562..dbefc13 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 1 Red.png and b/rsc/graphics/sprites/barrier/slot 1 red.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 2 Green.png b/rsc/graphics/sprites/barrier/slot 2 green.png similarity index 79% rename from rsc/graphics/sprites/Barrier/Slot 2 Green.png rename to rsc/graphics/sprites/barrier/slot 2 green.png index 495d98e..b5ba3c3 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 2 Green.png and b/rsc/graphics/sprites/barrier/slot 2 green.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 2 Red.png b/rsc/graphics/sprites/barrier/slot 2 red.png similarity index 78% rename from rsc/graphics/sprites/Barrier/Slot 2 Red.png rename to rsc/graphics/sprites/barrier/slot 2 red.png index 42ceecf..4fedc1b 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 2 Red.png and b/rsc/graphics/sprites/barrier/slot 2 red.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 3 Green.png b/rsc/graphics/sprites/barrier/slot 3 green.png similarity index 84% rename from rsc/graphics/sprites/Barrier/Slot 3 Green.png rename to rsc/graphics/sprites/barrier/slot 3 green.png index c249d98..a4d8117 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 3 Green.png and b/rsc/graphics/sprites/barrier/slot 3 green.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 3 Red.png b/rsc/graphics/sprites/barrier/slot 3 red.png similarity index 89% rename from rsc/graphics/sprites/Barrier/Slot 3 Red.png rename to rsc/graphics/sprites/barrier/slot 3 red.png index 41e49ad..5d78b1e 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 3 Red.png and b/rsc/graphics/sprites/barrier/slot 3 red.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 4 Green.png b/rsc/graphics/sprites/barrier/slot 4 green.png similarity index 78% rename from rsc/graphics/sprites/Barrier/Slot 4 Green.png rename to rsc/graphics/sprites/barrier/slot 4 green.png index f67fb24..22e3859 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 4 Green.png and b/rsc/graphics/sprites/barrier/slot 4 green.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 4 Red.png b/rsc/graphics/sprites/barrier/slot 4 red.png similarity index 88% rename from rsc/graphics/sprites/Barrier/Slot 4 Red.png rename to rsc/graphics/sprites/barrier/slot 4 red.png index 62c64f1..e71ef34 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 4 Red.png and b/rsc/graphics/sprites/barrier/slot 4 red.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 5 Green.png b/rsc/graphics/sprites/barrier/slot 5 green.png similarity index 83% rename from rsc/graphics/sprites/Barrier/Slot 5 Green.png rename to rsc/graphics/sprites/barrier/slot 5 green.png index ed67d2f..97f8f44 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 5 Green.png and b/rsc/graphics/sprites/barrier/slot 5 green.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 5 Red.png b/rsc/graphics/sprites/barrier/slot 5 red.png similarity index 83% rename from rsc/graphics/sprites/Barrier/Slot 5 Red.png rename to rsc/graphics/sprites/barrier/slot 5 red.png index d9cab51..9ccb52f 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 5 Red.png and b/rsc/graphics/sprites/barrier/slot 5 red.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 6 Green.png b/rsc/graphics/sprites/barrier/slot 6 green.png similarity index 84% rename from rsc/graphics/sprites/Barrier/Slot 6 Green.png rename to rsc/graphics/sprites/barrier/slot 6 green.png index 13d31ba..5ca4652 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 6 Green.png and b/rsc/graphics/sprites/barrier/slot 6 green.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 6 Red.png b/rsc/graphics/sprites/barrier/slot 6 red.png similarity index 84% rename from rsc/graphics/sprites/Barrier/Slot 6 Red.png rename to rsc/graphics/sprites/barrier/slot 6 red.png index 764a558..8b69f6d 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 6 Red.png and b/rsc/graphics/sprites/barrier/slot 6 red.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 7 Green.png b/rsc/graphics/sprites/barrier/slot 7 green.png similarity index 87% rename from rsc/graphics/sprites/Barrier/Slot 7 Green.png rename to rsc/graphics/sprites/barrier/slot 7 green.png index db29c2f..ea2ad98 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 7 Green.png and b/rsc/graphics/sprites/barrier/slot 7 green.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 7 Red.png b/rsc/graphics/sprites/barrier/slot 7 red.png similarity index 85% rename from rsc/graphics/sprites/Barrier/Slot 7 Red.png rename to rsc/graphics/sprites/barrier/slot 7 red.png index 2818ca8..4e6458c 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 7 Red.png and b/rsc/graphics/sprites/barrier/slot 7 red.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 8 Green.png b/rsc/graphics/sprites/barrier/slot 8 green.png similarity index 84% rename from rsc/graphics/sprites/Barrier/Slot 8 Green.png rename to rsc/graphics/sprites/barrier/slot 8 green.png index 554b2ed..6506635 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 8 Green.png and b/rsc/graphics/sprites/barrier/slot 8 green.png differ diff --git a/rsc/graphics/sprites/Barrier/Slot 8 Red.png b/rsc/graphics/sprites/barrier/slot 8 red.png similarity index 84% rename from rsc/graphics/sprites/Barrier/Slot 8 Red.png rename to rsc/graphics/sprites/barrier/slot 8 red.png index 96e71c9..9e189f6 100644 Binary files a/rsc/graphics/sprites/Barrier/Slot 8 Red.png and b/rsc/graphics/sprites/barrier/slot 8 red.png differ diff --git a/rsc/graphics/sprites/Barrier/Slots.png b/rsc/graphics/sprites/barrier/slots.png similarity index 90% rename from rsc/graphics/sprites/Barrier/Slots.png rename to rsc/graphics/sprites/barrier/slots.png index 63cf23d..1b7f6a0 100644 Binary files a/rsc/graphics/sprites/Barrier/Slots.png and b/rsc/graphics/sprites/barrier/slots.png differ