diff --git a/img/sign/sign_0.jpg b/img/sign/0/sign_0.jpg similarity index 100% rename from img/sign/sign_0.jpg rename to img/sign/0/sign_0.jpg diff --git a/img/sign/sign_1.jpg b/img/sign/0/sign_1.jpg similarity index 100% rename from img/sign/sign_1.jpg rename to img/sign/0/sign_1.jpg diff --git a/img/sign/sign_10.jpg b/img/sign/0/sign_10.jpg similarity index 100% rename from img/sign/sign_10.jpg rename to img/sign/0/sign_10.jpg diff --git a/img/sign/sign_11.jpg b/img/sign/0/sign_11.jpg similarity index 100% rename from img/sign/sign_11.jpg rename to img/sign/0/sign_11.jpg diff --git a/img/sign/sign_12.jpg b/img/sign/0/sign_12.jpg similarity index 100% rename from img/sign/sign_12.jpg rename to img/sign/0/sign_12.jpg diff --git a/img/sign/sign_2.jpg b/img/sign/0/sign_2.jpg similarity index 100% rename from img/sign/sign_2.jpg rename to img/sign/0/sign_2.jpg diff --git a/img/sign/sign_3.jpg b/img/sign/0/sign_3.jpg similarity index 100% rename from img/sign/sign_3.jpg rename to img/sign/0/sign_3.jpg diff --git a/img/sign/sign_4.jpg b/img/sign/0/sign_4.jpg similarity index 100% rename from img/sign/sign_4.jpg rename to img/sign/0/sign_4.jpg diff --git a/img/sign/sign_5.jpg b/img/sign/0/sign_5.jpg similarity index 100% rename from img/sign/sign_5.jpg rename to img/sign/0/sign_5.jpg diff --git a/img/sign/sign_6.jpg b/img/sign/0/sign_6.jpg similarity index 100% rename from img/sign/sign_6.jpg rename to img/sign/0/sign_6.jpg diff --git a/img/sign/sign_7.jpg b/img/sign/0/sign_7.jpg similarity index 100% rename from img/sign/sign_7.jpg rename to img/sign/0/sign_7.jpg diff --git a/img/sign/sign_8.jpg b/img/sign/0/sign_8.jpg similarity index 100% rename from img/sign/sign_8.jpg rename to img/sign/0/sign_8.jpg diff --git a/img/sign/sign_9.jpg b/img/sign/0/sign_9.jpg similarity index 100% rename from img/sign/sign_9.jpg rename to img/sign/0/sign_9.jpg diff --git a/img/sign/1/sign.jpg b/img/sign/1/sign.jpg new file mode 100644 index 0000000..9eefbbb Binary files /dev/null and b/img/sign/1/sign.jpg differ diff --git a/img/sign/1/sign_0.jpg b/img/sign/1/sign_0.jpg new file mode 100644 index 0000000..8cf3fc3 Binary files /dev/null and b/img/sign/1/sign_0.jpg differ diff --git a/img/sign/1/sign_0.png b/img/sign/1/sign_0.png new file mode 100644 index 0000000..8cb9a70 Binary files /dev/null and b/img/sign/1/sign_0.png differ diff --git a/img/sign/1/sign_1.jpg b/img/sign/1/sign_1.jpg new file mode 100644 index 0000000..fda66e2 Binary files /dev/null and b/img/sign/1/sign_1.jpg differ diff --git a/img/sign/1/sign_10.jpg b/img/sign/1/sign_10.jpg new file mode 100644 index 0000000..6a077b9 Binary files /dev/null and b/img/sign/1/sign_10.jpg differ diff --git a/img/sign/1/sign_11.jpg b/img/sign/1/sign_11.jpg new file mode 100644 index 0000000..2474429 Binary files /dev/null and b/img/sign/1/sign_11.jpg differ diff --git a/img/sign/1/sign_12.jpg b/img/sign/1/sign_12.jpg new file mode 100644 index 0000000..35fc18f Binary files /dev/null and b/img/sign/1/sign_12.jpg differ diff --git a/img/sign/1/sign_2.jpg b/img/sign/1/sign_2.jpg new file mode 100644 index 0000000..15bb267 Binary files /dev/null and b/img/sign/1/sign_2.jpg differ diff --git a/img/sign/1/sign_3.jpg b/img/sign/1/sign_3.jpg new file mode 100644 index 0000000..af5d24b Binary files /dev/null and b/img/sign/1/sign_3.jpg differ diff --git a/img/sign/1/sign_4.jpg b/img/sign/1/sign_4.jpg new file mode 100644 index 0000000..4c73be4 Binary files /dev/null and b/img/sign/1/sign_4.jpg differ diff --git a/img/sign/1/sign_5.jpg b/img/sign/1/sign_5.jpg new file mode 100644 index 0000000..9eefbbb Binary files /dev/null and b/img/sign/1/sign_5.jpg differ diff --git a/img/sign/1/sign_6.jpg b/img/sign/1/sign_6.jpg new file mode 100644 index 0000000..67c4c62 Binary files /dev/null and b/img/sign/1/sign_6.jpg differ diff --git a/img/sign/1/sign_7.jpg b/img/sign/1/sign_7.jpg new file mode 100644 index 0000000..208efed Binary files /dev/null and b/img/sign/1/sign_7.jpg differ diff --git a/img/sign/1/sign_8.jpg b/img/sign/1/sign_8.jpg new file mode 100644 index 0000000..881fd80 Binary files /dev/null and b/img/sign/1/sign_8.jpg differ diff --git a/img/sign/1/sign_9.jpg b/img/sign/1/sign_9.jpg new file mode 100644 index 0000000..c2c91ae Binary files /dev/null and b/img/sign/1/sign_9.jpg differ diff --git a/main.cpp b/main.cpp index 7af4fe1..df15a51 100644 --- a/main.cpp +++ b/main.cpp @@ -286,25 +286,20 @@ void drawThemeMenu() */ void animatedSign(int selectedImage) { - int i = 0; int j = 0; - char *files[] = { - "./img/sign/sign_1.jpg", - "./img/sign/sign_2.jpg", - "./img/sign/sign_3.jpg", - "./img/sign/sign_4.jpg", - "./img/sign/sign_5.jpg", - "./img/sign/sign_6.jpg", - "./img/sign/sign_7.jpg", - "./img/sign/sign_8.jpg", - "./img/sign/sign_9.jpg", - "./img/sign/sign_10.jpg", - "./img/sign/sign_11.jpg", - "./img/sign/sign_12.jpg", - }; - - readimagefile("./img/sign/sign_0.jpg", 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); + + char files[13][30]; + char *firstPart = "./img/sign/"; + for (int i = 1; i <= 12; i++) + { + sprintf(files[i], "%s%d/sign_%d.jpg", firstPart, themeSelection, i); + } + + char noSignImage[30]; + sprintf(noSignImage, "%s%d/sign_%d.jpg", firstPart, themeSelection, 0); + + readimagefile(noSignImage, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); for (j = 0; j < 100; j += 10) { @@ -327,7 +322,7 @@ void animatedSign(int selectedImage) for (i = 0; i < 5; i++) { - readimagefile("./img/sign/sign_0.jpg", 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); + readimagefile(noSignImage, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); delay(50); readimagefile(files[selectedImage - 1], 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); delay(100); diff --git a/main.exe b/main.exe index cc85133..8d8cb7a 100644 Binary files a/main.exe and b/main.exe differ diff --git a/tempCodeRunnerFile.cpp b/tempCodeRunnerFile.cpp deleted file mode 100644 index e6c72c9..0000000 --- a/tempCodeRunnerFile.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#pragma end region - -#pragma region definitions - -///////////////// -// DEFINITIONS // -///////////////// \ No newline at end of file