From c0d5325e238942bfb6c77c60e1a6c8751597f016 Mon Sep 17 00:00:00 2001 From: Johnny Jazeix Date: Fri, 27 Mar 2026 11:01:21 +0100 Subject: [PATCH 1/3] rename car to wagon Fixes: 109 --- Sounds/car.wav => Sounds.wagon.wav | Bin src/audio.cc | 4 ++-- src/audio.h | 2 +- src/editor.cc | 12 ++++++------ src/game.cc | 4 ++-- src/loco.cc | 20 ++++++++++---------- src/loco.h | 2 +- src/preference.h | 2 +- src/sprite.h | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) rename Sounds/car.wav => Sounds.wagon.wav (100%) diff --git a/Sounds/car.wav b/Sounds.wagon.wav similarity index 100% rename from Sounds/car.wav rename to Sounds.wagon.wav diff --git a/src/audio.cc b/src/audio.cc index 5ea5a4e..c965e6d 100644 --- a/src/audio.cc +++ b/src/audio.cc @@ -85,9 +85,9 @@ bool Audio::Init() Utils::GetPath(PathFile); Sound[sExpand] = Mix_LoadWAV(PathFile); - strcpy(PathFile, "Sounds/car.wav"); + strcpy(PathFile, "Sounds/wagon.wav"); Utils::GetPath(PathFile); - Sound[sCar] = Mix_LoadWAV(PathFile); + Sound[sWagon] = Mix_LoadWAV(PathFile); strcpy(PathFile, "Sounds/shrink.wav"); Utils::GetPath(PathFile); diff --git a/src/audio.h b/src/audio.h index 2646c7e..dc352a6 100644 --- a/src/audio.h +++ b/src/audio.h @@ -35,7 +35,7 @@ enum eSound { sEnd, sLose, sExpand, - sCar, + sWagon, sShrink, sLive, sSize diff --git a/src/editor.cc b/src/editor.cc index a573d2b..fad4486 100644 --- a/src/editor.cc +++ b/src/editor.cc @@ -157,8 +157,8 @@ eMenu Editor::SDLMain(int LevelNumber) } m_level.T[NumN].T[cy * LT + cx] = TypeB; break; - case car: - m_level.T[NumN].T[cy * LT + cx] = C_Car; + case wagon: + m_level.T[NumN].T[cy * LT + cx] = C_Wagon; break; case expander: m_level.T[NumN].T[cy * LT + cx] = C_Expand; @@ -249,8 +249,8 @@ void Editor::Draw() const // Display possible sprites for (i = 0; i < LT * HT; i++) { switch (T[i]) { - case C_Car: // Car sprite - Sprites[car].Draw(i % LT * D_Case + D_Case / 2, i / LT * D_Case + D_Case / 2, 25); + case C_Wagon: // Wagon sprite + Sprites[wagon].Draw(i % LT * D_Case + D_Case / 2, i / LT * D_Case + D_Case / 2, 25); break; case C_Expand: // Expand sprite Sprites[expander].Draw(i % LT * D_Case + D_Case / 2, i / LT * D_Case + D_Case / 2, 25); @@ -286,7 +286,7 @@ void Editor::Draw() const // Displays selected option in the menu switch (Option) { case rail: - case car: + case wagon: case expander: case shrinker: case speed: @@ -411,7 +411,7 @@ void Editor::GetKeyPress(int Key) Option = rail; break; case 'z': - Option = car; + Option = wagon; break; case 'e': Option = expander; diff --git a/src/game.cc b/src/game.cc index b8938d0..658559b 100644 --- a/src/game.cc +++ b/src/game.cc @@ -528,8 +528,8 @@ void Game::DisplayScreen() // Display options for (i = 0; i < LT * HT; i++) { switch (T[i]) { - case C_Car: // if car sprite - m_screen.PrintSprite(car, (GameClock * 40 / 1000 + i * 7) % 50, i % LT * D_Case + D_Case / 2, i / LT * D_Case + D_Case / 2); + case C_Wagon: // if wagon sprite + m_screen.PrintSprite(wagon, (GameClock * 40 / 1000 + i * 7) % 50, i % LT * D_Case + D_Case / 2, i / LT * D_Case + D_Case / 2); break; case C_Expand: // if expander sprite m_screen.PrintSprite(expander, (GameClock * 40 / 1000 + i * 7) % 50, i % LT * D_Case + D_Case / 2, i / LT * D_Case + D_Case / 2); diff --git a/src/loco.cc b/src/loco.cc index f21e5dd..e939560 100644 --- a/src/loco.cc +++ b/src/loco.cc @@ -118,7 +118,7 @@ void Loco::Display(Screen &screen) int cdx, cdy, cfx = 0, cfy = 0; // Attachment point for cables float lv; - // Display all wagon/(cars) + // Display all wagon for (i = 0; i < NWagon; i++) { // Search wagon points switch (Wagon[i]) { @@ -135,7 +135,7 @@ void Loco::Display(Screen &screen) lv = 20; } - // Calculate cars point's position + // Calculate wagons point's position FindPoint(D - p1, x1, y1); FindPoint(D - p2, x2, y2); @@ -186,7 +186,7 @@ void Loco::Display(Screen &screen) // Displays the cable screen.PrintCable(cdx, cdy, cfx, cfy); } - // Calculate the attachment point for the next Wagon/car + // Calculate the attachment point for the next Wagon cfx = x1 - (int)(sin(ar + M_PI) * lv); cfy = y1 - (int)(cos(ar + M_PI) * lv); @@ -222,7 +222,7 @@ void Loco::Display(Screen &screen) } } - // Add gap between the wagons/cars + // Add gap between the wagons ltrain += Pref.WagonGap; } } @@ -240,15 +240,15 @@ void Loco::TestTile(float Dist, long GameDuration, int *Level) if (D <= DMoy && D + Dist >= DMoy) { // Check if on an item switch (Level[T[LocoPos].P]) { - case C_Car: // New wagon/car - m_audio.Play(sCar); + case C_Wagon: // New wagon + m_audio.Play(sWagon); Level[T[LocoPos].P] = 1; // Remove item from level Pref.Score += 5; AddLoco(); // Add a random wagon Win = true; // Check if it was the last wagon for win condition for (i = 0; i < LT * HT; i++) { - if (Level[i] == C_Car) { + if (Level[i] == C_Wagon) { Win = false; } } @@ -291,7 +291,7 @@ void Loco::TestTile(float Dist, long GameDuration, int *Level) break; } - // Collision check with another wagon/car + // Collision check with another wagon for (i = 1; i < NWagon; i++) { vx = (float)(PosWagon[i].dx - PosWagon[0].dx); vy = (float)(PosWagon[i].dy - PosWagon[0].dy); @@ -663,9 +663,9 @@ void Loco::FindPoint(float Dist, int &x, int &y) /*********************************************/ void Loco::AddLoco() { - Wagon[NWagon] = (e_Sprite)(rand() % (car - logs_wagon) + logs_wagon); + Wagon[NWagon] = (e_Sprite)(rand() % (wagon - logs_wagon) + logs_wagon); if (Wagon[NWagon] == Wagon[NWagon - 1]) { // Avoids adding the same sprite twice - if (Wagon[NWagon] + 1 == car) { + if (Wagon[NWagon] + 1 == wagon) { Wagon[NWagon] = logs_wagon; } else { diff --git a/src/loco.h b/src/loco.h index aeab20f..e05b044 100644 --- a/src/loco.h +++ b/src/loco.h @@ -58,7 +58,7 @@ class Loco void MoveForward(int Duration, long GameDuration, int *Key, int *Level); // Makes locomotive move forward for Duration in ms void FindArrow(int *Level, int *Key); // Search the position of the next intersection bool TestDir(int FDir, int *Level); // Check if a direction/turn is possible - void AddLoco(); // Adds a random car to the locomotive + void AddLoco(); // Adds a random wagon to the locomotive inline bool Go(int FutureDirection); // Move the locomotive inline void FindPoint(float Dist, int &x, int &y); // Searching a point on the map diff --git a/src/preference.h b/src/preference.h index f2f9eac..7087b6c 100644 --- a/src/preference.h +++ b/src/preference.h @@ -58,7 +58,7 @@ /*** Possible pieces on the level ***/ #define C_None 0 #define C_Rail 1 -#define C_Car 2 +#define C_Wagon 2 #define C_Expand 3 #define C_Shrink 4 #define C_Speed 5 diff --git a/src/sprite.h b/src/sprite.h index 7ce3117..58ac834 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -50,7 +50,7 @@ enum e_Sprite { cargo_wagon, engine_wagon, cistern_wagon, - car, + wagon, expander, shrinker, speed, From 5f73ff2be40e5401bb42dcf881275b6f5fc895db Mon Sep 17 00:00:00 2001 From: zabidenhtf Date: Fri, 27 Mar 2026 10:58:39 +0000 Subject: [PATCH 2/3] Music renamed from french on english --- README.md | 2 +- Sounds/{jeu1.xm => ingame1.xm} | Bin Sounds/{jeu2.xm => ingame2.xm} | Bin Sounds.wagon.wav => Sounds/wagon.wav | Bin src/audio.cc | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename Sounds/{jeu1.xm => ingame1.xm} (100%) rename Sounds/{jeu2.xm => ingame2.xm} (100%) rename Sounds.wagon.wav => Sounds/wagon.wav (100%) diff --git a/README.md b/README.md index 63bb43c..0b4ccad 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Copyright (c) 2006 Dominique Roux-Serret: design & programming & graphics & website. Maf464: musics -Copyright (c) 2006 (for "menu.mod", "jeu1.xm", "jeu2.xm") MAF464 (email charcosset.b@free.fr; website http://maf464.free.fr). This music licensed under GPL license. See COPYING for details +Copyright (c) 2006 (for "menu.mod", "ingame1.xm", "ingame2.xm") MAF464 (email charcosset.b@free.fr; website http://maf464.free.fr). This music licensed under GPL license. See COPYING for details [Get it on F-Droid Date: Sat, 28 Mar 2026 14:43:05 +0000 Subject: [PATCH 3/3] Game data moved into Assets directory --- {data => Assets}/language.Ar | Bin {data => Assets}/language.Br | Bin {data => Assets}/language.Cn | Bin {data => Assets}/language.De | Bin {data => Assets}/language.Du | Bin {data => Assets}/language.En | Bin {data => Assets}/language.Eo | Bin {data => Assets}/language.Es | Bin {data => Assets}/language.Fr | Bin {data => Assets}/language.Hu | Bin {data => Assets}/language.It | Bin {data => Assets}/language.Jp | Bin {data => Assets}/language.Ko | Bin {data => Assets}/language.Pl | Bin {data => Assets}/language.Po | Bin {data => Assets}/language.Ru | Bin {data => Assets}/language.Se | Bin {data => Assets}/language.Sl | Bin {data => Assets}/language.Tu | Bin {data => Assets}/language.dat | Bin {data => Assets}/levels.dat | Bin {data => Assets}/sprites.dat | Bin CMakeLists.txt | 16 +++++++++------- CPackLists.txt | 4 ++-- {data => Icons}/Li-ri-icon-128x128.png | Bin {data => Icons}/Li-ri-icon-16x16.png | Bin {data => Icons}/Li-ri-icon-32x32.png | Bin {data => Icons}/Li-ri-icon-48x48.png | Bin {data => Icons}/Li-ri-icon-64x64.png | Bin {data => Icons}/li-ri.ico | Bin ...gamecontrollerdb.txt => gamecontrollerdb.txt | 0 src/level.cc | 4 ++-- src/sprite.cc | 13 ++++++------- 33 files changed, 19 insertions(+), 18 deletions(-) rename {data => Assets}/language.Ar (100%) rename {data => Assets}/language.Br (100%) rename {data => Assets}/language.Cn (100%) rename {data => Assets}/language.De (100%) rename {data => Assets}/language.Du (100%) rename {data => Assets}/language.En (100%) rename {data => Assets}/language.Eo (100%) rename {data => Assets}/language.Es (100%) rename {data => Assets}/language.Fr (100%) rename {data => Assets}/language.Hu (100%) rename {data => Assets}/language.It (100%) rename {data => Assets}/language.Jp (100%) rename {data => Assets}/language.Ko (100%) rename {data => Assets}/language.Pl (100%) rename {data => Assets}/language.Po (100%) rename {data => Assets}/language.Ru (100%) rename {data => Assets}/language.Se (100%) rename {data => Assets}/language.Sl (100%) rename {data => Assets}/language.Tu (100%) rename {data => Assets}/language.dat (100%) rename {data => Assets}/levels.dat (100%) rename {data => Assets}/sprites.dat (100%) rename {data => Icons}/Li-ri-icon-128x128.png (100%) rename {data => Icons}/Li-ri-icon-16x16.png (100%) rename {data => Icons}/Li-ri-icon-32x32.png (100%) rename {data => Icons}/Li-ri-icon-48x48.png (100%) rename {data => Icons}/Li-ri-icon-64x64.png (100%) rename {data => Icons}/li-ri.ico (100%) rename data/gamecontrollerdb.txt => gamecontrollerdb.txt (100%) diff --git a/data/language.Ar b/Assets/language.Ar similarity index 100% rename from data/language.Ar rename to Assets/language.Ar diff --git a/data/language.Br b/Assets/language.Br similarity index 100% rename from data/language.Br rename to Assets/language.Br diff --git a/data/language.Cn b/Assets/language.Cn similarity index 100% rename from data/language.Cn rename to Assets/language.Cn diff --git a/data/language.De b/Assets/language.De similarity index 100% rename from data/language.De rename to Assets/language.De diff --git a/data/language.Du b/Assets/language.Du similarity index 100% rename from data/language.Du rename to Assets/language.Du diff --git a/data/language.En b/Assets/language.En similarity index 100% rename from data/language.En rename to Assets/language.En diff --git a/data/language.Eo b/Assets/language.Eo similarity index 100% rename from data/language.Eo rename to Assets/language.Eo diff --git a/data/language.Es b/Assets/language.Es similarity index 100% rename from data/language.Es rename to Assets/language.Es diff --git a/data/language.Fr b/Assets/language.Fr similarity index 100% rename from data/language.Fr rename to Assets/language.Fr diff --git a/data/language.Hu b/Assets/language.Hu similarity index 100% rename from data/language.Hu rename to Assets/language.Hu diff --git a/data/language.It b/Assets/language.It similarity index 100% rename from data/language.It rename to Assets/language.It diff --git a/data/language.Jp b/Assets/language.Jp similarity index 100% rename from data/language.Jp rename to Assets/language.Jp diff --git a/data/language.Ko b/Assets/language.Ko similarity index 100% rename from data/language.Ko rename to Assets/language.Ko diff --git a/data/language.Pl b/Assets/language.Pl similarity index 100% rename from data/language.Pl rename to Assets/language.Pl diff --git a/data/language.Po b/Assets/language.Po similarity index 100% rename from data/language.Po rename to Assets/language.Po diff --git a/data/language.Ru b/Assets/language.Ru similarity index 100% rename from data/language.Ru rename to Assets/language.Ru diff --git a/data/language.Se b/Assets/language.Se similarity index 100% rename from data/language.Se rename to Assets/language.Se diff --git a/data/language.Sl b/Assets/language.Sl similarity index 100% rename from data/language.Sl rename to Assets/language.Sl diff --git a/data/language.Tu b/Assets/language.Tu similarity index 100% rename from data/language.Tu rename to Assets/language.Tu diff --git a/data/language.dat b/Assets/language.dat similarity index 100% rename from data/language.dat rename to Assets/language.dat diff --git a/data/levels.dat b/Assets/levels.dat similarity index 100% rename from data/levels.dat rename to Assets/levels.dat diff --git a/data/sprites.dat b/Assets/sprites.dat similarity index 100% rename from data/sprites.dat rename to Assets/sprites.dat diff --git a/CMakeLists.txt b/CMakeLists.txt index bdd58d6..d4a1975 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,17 +98,19 @@ install(TARGETS ${LIRI_EXECUTABLE_NAME} install(FILES io.github.petitlapin.Li-ri.appdata.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata/") install(FILES io.github.petitlapin.Li-ri.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/") -install(FILES data/Li-ri-icon-16x16.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps/" RENAME io.github.petitlapin.Li-ri.png) -install(FILES data/Li-ri-icon-32x32.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps/" RENAME io.github.petitlapin.Li-ri.png) -install(FILES data/Li-ri-icon-48x48.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps/" RENAME io.github.petitlapin.Li-ri.png) -install(FILES data/Li-ri-icon-64x64.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps/" RENAME io.github.petitlapin.Li-ri.png) -install(FILES data/Li-ri-icon-128x128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/" RENAME io.github.petitlapin.Li-ri.png) +install(FILES Icons/Li-ri-icon-16x16.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps/" RENAME io.github.petitlapin.Li-ri.png) +install(FILES Icons/Li-ri-icon-32x32.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps/" RENAME io.github.petitlapin.Li-ri.png) +install(FILES Icons/Li-ri-icon-48x48.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps/" RENAME io.github.petitlapin.Li-ri.png) +install(FILES Icons/Li-ri-icon-64x64.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps/" RENAME io.github.petitlapin.Li-ri.png) +install(FILES Icons/Li-ri-icon-128x128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/" RENAME io.github.petitlapin.Li-ri.png) if(WIN32) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/data/ DESTINATION bin) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/Assets DESTINATION bin) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/Icons DESTINATION bin) install(DIRECTORY ${CMAKE_SOURCE_DIR}/Sounds DESTINATION bin) else() - install(DIRECTORY ${CMAKE_SOURCE_DIR}/data/ DESTINATION "${CMAKE_INSTALL_DATADIR}/Li-ri") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/Assets DESTINATION "${CMAKE_INSTALL_DATADIR}/Li-ri") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/Icons DESTINATION "${CMAKE_INSTALL_DATADIR}/Li-ri") install(DIRECTORY ${CMAKE_SOURCE_DIR}/Sounds DESTINATION "${CMAKE_INSTALL_DATADIR}/Li-ri") endif() option(RILI_ENABLE_IPO diff --git a/CPackLists.txt b/CPackLists.txt index 50673c4..79b15cf 100644 --- a/CPackLists.txt +++ b/CPackLists.txt @@ -17,7 +17,7 @@ if(WIN32) set(CPACK_PACKAGE_INSTALL_DIRECTORY "${LIRI_EXECUTABLE_NAME}") set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${LIRI_EXECUTABLE_NAME}") #set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/installer\\\\gcompris-header.bmp") - set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/data\\\\li-ri.ico") + set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/Icons\\\\li-ri.ico") #set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/installer\\\\Liri-uninstall.ico") #set(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${PROJECT_SOURCE_DIR}/installer\\\\welcome-page.bmp") #set(CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP "${PROJECT_SOURCE_DIR}/installer\\\\welcome-page.bmp") @@ -31,7 +31,7 @@ if(WIN32) set(CPACK_NSIS_MUI_FINISHPAGE_RUN "${LIRI_EXECUTABLE_NAME}") set(CPACK_PACKAGE_VENDOR "Li-Ri team") else() - set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/data/Li-ri-icon-48x48.png") + set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/Icons/Li-ri-icon-48x48.png") endif() if(UNIX) diff --git a/data/Li-ri-icon-128x128.png b/Icons/Li-ri-icon-128x128.png similarity index 100% rename from data/Li-ri-icon-128x128.png rename to Icons/Li-ri-icon-128x128.png diff --git a/data/Li-ri-icon-16x16.png b/Icons/Li-ri-icon-16x16.png similarity index 100% rename from data/Li-ri-icon-16x16.png rename to Icons/Li-ri-icon-16x16.png diff --git a/data/Li-ri-icon-32x32.png b/Icons/Li-ri-icon-32x32.png similarity index 100% rename from data/Li-ri-icon-32x32.png rename to Icons/Li-ri-icon-32x32.png diff --git a/data/Li-ri-icon-48x48.png b/Icons/Li-ri-icon-48x48.png similarity index 100% rename from data/Li-ri-icon-48x48.png rename to Icons/Li-ri-icon-48x48.png diff --git a/data/Li-ri-icon-64x64.png b/Icons/Li-ri-icon-64x64.png similarity index 100% rename from data/Li-ri-icon-64x64.png rename to Icons/Li-ri-icon-64x64.png diff --git a/data/li-ri.ico b/Icons/li-ri.ico similarity index 100% rename from data/li-ri.ico rename to Icons/li-ri.ico diff --git a/data/gamecontrollerdb.txt b/gamecontrollerdb.txt similarity index 100% rename from data/gamecontrollerdb.txt rename to gamecontrollerdb.txt diff --git a/src/level.cc b/src/level.cc index be49ba9..91eebc3 100644 --- a/src/level.cc +++ b/src/level.cc @@ -40,7 +40,7 @@ bool Level::Load() unsigned char *Buf; long L, P = 2; int i, j; - char NameLevelFile[512] = "levels.dat"; + char NameLevelFile[512] = "Assets/levels.dat"; Utils::GetPath(NameLevelFile); L = Utils::LoadFile(NameLevelFile, Buf); @@ -80,7 +80,7 @@ bool Level::Save() unsigned char *Buf; long P = 2; int i, j; - char NameLevelFile[512] = "levels.dat"; + char NameLevelFile[512] = "Assets/levels.dat"; // Allocate memory Buf = new unsigned char[sizeof(s_Level) * N + sizeof(int) + 1]; diff --git a/src/sprite.cc b/src/sprite.cc index 407cd4e..1a4e266 100644 --- a/src/sprite.cc +++ b/src/sprite.cc @@ -74,9 +74,8 @@ bool LoadLanguage() long L, P; int i; unsigned char *Buf; - char PathFile[512]; - - strcpy(PathFile, Languages[Pref.Language]); + char PathFile[512] = "Assets/"; + strcat(PathFile, Languages[Pref.Language]); Utils::GetPath(PathFile); if (Utils::FileExists(PathFile) == false) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find '%s'", Languages[Pref.Language]); @@ -108,7 +107,7 @@ bool LoadSprites() unsigned char *Buf; int NSp; - char PathFile[512] = "language.dat"; + char PathFile[512] = "Assets/language.dat"; Utils::GetPath(PathFile); // Initialize characters table for texts @@ -129,7 +128,7 @@ bool LoadSprites() // *** Loads the languages file *** // ******************************** if (Utils::FileExists(PathFile) == false) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find 'language.dat'"); + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find 'Assets/language.dat'"); return false; } L = Utils::LoadFile(PathFile, Buf); @@ -166,10 +165,10 @@ bool LoadSprites() // *** loads sprites file *** // ************************** - strcpy(PathFile, "sprites.dat"); + strcpy(PathFile, "Assets/sprites.dat"); Utils::GetPath(PathFile); if (Utils::FileExists(PathFile) == false) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find 'sprites.dat'"); + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find 'Assets/sprites.dat'"); return false; } L = Utils::LoadFile(PathFile, Buf);