Skip to content

Game data moved into Assets directory #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zabidenhtf wants to merge 4 commits into from
Closed

Game data moved into Assets directory #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0d5325
rename car to wagon
petitlapin Mar 27, 2026
5f73ff2
Music renamed from french on english
zabidenhtf Mar 27, 2026
73f3409
Game data moved into Assets directory
zabidenhtf Mar 28, 2026
1b235ae
Merge branch 'main' into assetscleanup
zabidenhtf Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 data/language.Ar → Assets/language.Ar
View file
Open in desktop
File renamed without changes.
0 data/language.Br → Assets/language.Br
View file
Open in desktop
File renamed without changes.
0 data/language.Cn → Assets/language.Cn
View file
Open in desktop
File renamed without changes.
0 data/language.De → Assets/language.De
View file
Open in desktop
File renamed without changes.
0 data/language.Du → Assets/language.Du
View file
Open in desktop
File renamed without changes.
0 data/language.En → Assets/language.En
View file
Open in desktop
File renamed without changes.
0 data/language.Eo → Assets/language.Eo
View file
Open in desktop
File renamed without changes.
0 data/language.Es → Assets/language.Es
View file
Open in desktop
File renamed without changes.
0 data/language.Fr → Assets/language.Fr
View file
Open in desktop
File renamed without changes.
0 data/language.Hu → Assets/language.Hu
View file
Open in desktop
File renamed without changes.
0 data/language.It → Assets/language.It
View file
Open in desktop
File renamed without changes.
0 data/language.Jp → Assets/language.Jp
View file
Open in desktop
File renamed without changes.
0 data/language.Ko → Assets/language.Ko
View file
Open in desktop
File renamed without changes.
0 data/language.Pl → Assets/language.Pl
View file
Open in desktop
File renamed without changes.
0 data/language.Po → Assets/language.Po
View file
Open in desktop
File renamed without changes.
0 data/language.Ru → Assets/language.Ru
View file
Open in desktop
File renamed without changes.
0 data/language.Se → Assets/language.Se
View file
Open in desktop
File renamed without changes.
0 data/language.Sl → Assets/language.Sl
View file
Open in desktop
File renamed without changes.
0 data/language.Tu → Assets/language.Tu
View file
Open in desktop
File renamed without changes.
0 data/language.dat → Assets/language.dat
View file
Open in desktop
File renamed without changes.
0 data/levels.dat → Assets/levels.dat
View file
Open in desktop
File renamed without changes.
0 data/sprites.dat → Assets/sprites.dat
View file
Open in desktop
File renamed without changes.
16 changes: 9 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CPackLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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)
Expand Down
0 data/Li-ri-icon-128x128.png → Icons/Li-ri-icon-128x128.png
View file
Open in desktop
File renamed without changes
0 data/Li-ri-icon-16x16.png → Icons/Li-ri-icon-16x16.png
View file
Open in desktop
File renamed without changes
0 data/Li-ri-icon-32x32.png → Icons/Li-ri-icon-32x32.png
View file
Open in desktop
File renamed without changes
0 data/Li-ri-icon-48x48.png → Icons/Li-ri-icon-48x48.png
View file
Open in desktop
File renamed without changes
0 data/Li-ri-icon-64x64.png → Icons/Li-ri-icon-64x64.png
View file
Open in desktop
File renamed without changes
0 data/li-ri.ico → Icons/li-ri.ico
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Polishyk Mykyta "zabidentwfan@ukr.net": musics ("menu\_zabiden.ogg", "ingame1\_z
Copyright (c) 2006
Dominique Roux-Serret: design & programming & graphics & website.

Copyright (c) 2006 Maf464 (email charcosset.b@free.fr; website http://maf464.free.fr): ("menu\_maf.ogg", "ingame1\_maf.ogg", "ingame2\_maf.ogg")
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

[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
alt="Get it on F-Droid"
Expand Down
Binary file added Sounds/ingame1.xm
View file
Open in desktop
Binary file not shown.
Binary file added Sounds/ingame2.xm
View file
Open in desktop
Binary file not shown.
0 data/gamecontrollerdb.txt → gamecontrollerdb.txt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/level.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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];
Expand Down
13 changes: 6 additions & 7 deletions src/sprite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down Expand Up @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading