diff --git a/AUTHORS b/AUTHORS index eb77bd1..ca3bb32 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,9 @@ -Ri-li Game +Li-Ri Game -Official site : http://www.ri-li.org +Official site : http://github.com/petitlapin/Li-Ri + +Copyright (c) 2023 +Johnny Jazeix : port to SDL2 + android Copyright (c) 2006 Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website. diff --git a/README b/README index 34f8603..d549d92 100644 --- a/README +++ b/README @@ -1,7 +1,9 @@ -Ri-li is a arcade game licensed under the GPL (General Public License). +Li-Ri is a fork of Ri-li (http://www.ri-li.org). + +Li-Ri is a arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches for win.You can dowload it and play indefinitely. -It's Free. You can play on 'Windows', 'Linux', 'Mac OsX', 'AmigaOS4'. +It's Free. You can play on 'Windows', 'Linux', 'Mac OsX', 'Android'. Full-featured, - 19 languages: Arabic, Breton, Chinese, English, Esperanto, French, diff --git a/android/app/build.gradle b/android/app/build.gradle index 73494d8..21cbf23 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -12,7 +12,7 @@ android { sourceSets.main.jniLibs.srcDirs = ['src/main/libs'] defaultConfig { - applicationId "org.rili.rili" + applicationId "org.liri.liri" minSdkVersion 16 targetSdkVersion 33 } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 95a36fb..8ccdf6e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -12,7 +12,7 @@ android:allowBackup="true" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:hardwareAccelerated="true" > - - Ri-Li + Li-Ri diff --git a/configure b/configure index 74e869a..9575ec6 100755 --- a/configure +++ b/configure @@ -2980,7 +2980,7 @@ fi # Define the identity of the package. - PACKAGE=Ri-li + PACKAGE=Li-ri VERSION=3.0.0 diff --git a/configure.in b/configure.in index d18eee1..6ad03f3 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_INIT(src/main.cc) -AM_INIT_AUTOMAKE(Ri-li, 3.0.0) +AM_INIT_AUTOMAKE(Li-ri, 3.0.0) AC_CONFIG_SRCDIR([src/main.cc]) AC_CONFIG_HEADER([config.h]) diff --git a/data/Ri-li-icon-16x16.png b/data/Li-ri-icon-16x16.png similarity index 100% rename from data/Ri-li-icon-16x16.png rename to data/Li-ri-icon-16x16.png diff --git a/data/Ri-li-icon-32x32.png b/data/Li-ri-icon-32x32.png similarity index 100% rename from data/Ri-li-icon-32x32.png rename to data/Li-ri-icon-32x32.png diff --git a/data/Ri-li-icon-48x48.png b/data/Li-ri-icon-48x48.png similarity index 100% rename from data/Ri-li-icon-48x48.png rename to data/Li-ri-icon-48x48.png diff --git a/data/Makefile.am b/data/Makefile.am index 8fc4c9d..e63e243 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,2 +1,2 @@ datdir = $(datadir)/@PACKAGE@ -dat_HEADERS = levels.dat sprites.dat language.* Ri-li-icon-48x48.png Ri-li-icon-32x32.png Ri-li-icon-16x16.png ri-li.ico +dat_HEADERS = levels.dat sprites.dat language.* Li-ri-icon-48x48.png Li-ri-icon-32x32.png Li-ri-icon-16x16.png li-ri.ico diff --git a/data/Makefile.in b/data/Makefile.in index e606a59..072e9af 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -136,7 +136,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ datdir = $(datadir)/@PACKAGE@ -dat_HEADERS = levels.dat sprites.dat language.* Ri-li-icon-48x48.png Ri-li-icon-32x32.png Ri-li-icon-16x16.png ri-li.ico +dat_HEADERS = levels.dat sprites.dat language.* Li-ri-icon-48x48.png Li-ri-icon-32x32.png Li-ri-icon-16x16.png li-ri.ico all: all-am .SUFFIXES: diff --git a/data/ri-li.ico b/data/li-ri.ico similarity index 100% rename from data/ri-li.ico rename to data/li-ri.ico diff --git a/data/sprites.dat b/data/sprites.dat index 8ed6107..dd1ca58 100644 Binary files a/data/sprites.dat and b/data/sprites.dat differ diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 69add63..787825c 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,4 +1,4 @@ -Ri-li is a arcade game licensed under the GPL (General Public License). +Li-Ri is a arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches for win. Full-featured, @@ -8,3 +8,5 @@ Full-featured, - Colorful animated wood engine. - 50 levels in this first version - 3 beautiful musics and many sound effects. + +This version is a fork of the origin Ri-Li. diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt index 52797f0..77b7cac 100644 --- a/fastlane/metadata/android/en-US/short_description.txt +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -1 +1 @@ -Ri-li is a arcade game where you drive a toy wood engine. +Li-Ri is a arcade game where you drive a toy wood engine. diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt index f080898..7cb9da2 100644 --- a/fastlane/metadata/android/en-US/title.txt +++ b/fastlane/metadata/android/en-US/title.txt @@ -1 +1 @@ -Ri-Li +Li-Ri diff --git a/gentoo/Makefile.am b/gentoo/Makefile.am index 3269281..41904cc 100644 --- a/gentoo/Makefile.am +++ b/gentoo/Makefile.am @@ -1,2 +1,2 @@ datdir = $(datadir)/@PACKAGE@ -dat_HEADERS = games-arcade/Ri-li/Ri-li-2.0.1-r1.ebuild +dat_HEADERS = games-arcade/Li-ri/Li-ri-2.0.1-r1.ebuild diff --git a/gentoo/Makefile.in b/gentoo/Makefile.in index 735520d..10d9ea3 100644 --- a/gentoo/Makefile.in +++ b/gentoo/Makefile.in @@ -136,7 +136,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ datdir = $(datadir)/@PACKAGE@ -dat_HEADERS = games-arcade/Ri-li/Ri-li-2.0.0-r1.ebuild +dat_HEADERS = games-arcade/Li-ri/Li-ri-2.0.0-r1.ebuild all: all-am .SUFFIXES: @@ -237,7 +237,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/games-arcade/Ri-li + $(mkdir_p) $(distdir)/games-arcade/Li-ri @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/Makefile.am b/src/Makefile.am index c2c6271..97ed550 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ AM_CPPFLAGS=-DDATA_DIR="\"$(pkgdatadir)\"" -Wall -bin_PROGRAMS = Ri_li -Ri_li_SOURCES = audio.h audio.cc ecran.h ecran.cc editeur.h editeur.cc jeux.h jeux.cc loco.h loco.cc preference.h main.cc menu.h menu.cc mouse.h mouse.cc sprite.h sprite.cc tableau.h tableau.cc utils.h utils.cc +bin_PROGRAMS = Li_ri +Li_ri_SOURCES = audio.h audio.cc ecran.h ecran.cc editeur.h editeur.cc jeux.h jeux.cc loco.h loco.cc preference.h main.cc menu.h menu.cc mouse.h mouse.cc sprite.h sprite.cc tableau.h tableau.cc utils.h utils.cc diff --git a/src/Makefile.in b/src/Makefile.in index a7e7b6f..f53b30c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -34,7 +34,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -bin_PROGRAMS = Ri_li$(EXEEXT) +bin_PROGRAMS = Li_ri$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -47,12 +47,12 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_Ri_li_OBJECTS = audio.$(OBJEXT) ecran.$(OBJEXT) editeur.$(OBJEXT) \ +am_Li_ri_OBJECTS = audio.$(OBJEXT) ecran.$(OBJEXT) editeur.$(OBJEXT) \ jeux.$(OBJEXT) loco.$(OBJEXT) main.$(OBJEXT) menu.$(OBJEXT) \ mouse.$(OBJEXT) sprite.$(OBJEXT) tableau.$(OBJEXT) \ utils.$(OBJEXT) -Ri_li_OBJECTS = $(am_Ri_li_OBJECTS) -Ri_li_LDADD = $(LDADD) +Li_ri_OBJECTS = $(am_Li_ri_OBJECTS) +Li_ri_LDADD = $(LDADD) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -65,8 +65,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(Ri_li_SOURCES) -DIST_SOURCES = $(Ri_li_SOURCES) +SOURCES = $(Li_ri_SOURCES) +DIST_SOURCES = $(Li_ri_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -149,7 +149,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AM_CPPFLAGS = -DDATA_DIR="\"$(pkgdatadir)\"" -Wall -g -O0 #-fsanitize=address AM_LDFLAGS = #-fsanitize=address -Ri_li_SOURCES = audio.h audio.cc ecran.h ecran.cc editeur.h editeur.cc jeux.h jeux.cc loco.h loco.cc preference.h main.cc menu.h menu.cc mouse.h mouse.cc sprite.h sprite.cc tableau.h tableau.cc utils.h utils.cc +Li_ri_SOURCES = audio.h audio.cc ecran.h ecran.cc editeur.h editeur.cc jeux.h jeux.cc loco.h loco.cc preference.h main.cc menu.h menu.cc mouse.h mouse.cc sprite.h sprite.cc tableau.h tableau.cc utils.h utils.cc all: all-am .SUFFIXES: @@ -206,9 +206,9 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -Ri_li$(EXEEXT): $(Ri_li_OBJECTS) $(Ri_li_DEPENDENCIES) - @rm -f Ri_li$(EXEEXT) - $(CXXLINK) $(Ri_li_LDFLAGS) $(Ri_li_OBJECTS) $(Ri_li_LDADD) $(LIBS) +Li_ri$(EXEEXT): $(Li_ri_OBJECTS) $(Li_ri_DEPENDENCIES) + @rm -f Li_ri$(EXEEXT) + $(CXXLINK) $(Li_ri_LDFLAGS) $(Li_ri_OBJECTS) $(Li_ri_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/src/main.cc b/src/main.cc index 6cdac0b..43cccce 100644 --- a/src/main.cc +++ b/src/main.cc @@ -44,7 +44,7 @@ SDL_Window *sdlWindow; // Pointe sur l'écran video SDL_Renderer *sdlRenderer; // Pointe sur l'écran video -char Titre[]="Ri-li V3.0.0"; +char Titre[]="Li-ri V3.0.0"; Sprite *Sprites=NULL; // Pointe sur les sprites int NSprites=0; // Nombre de sprites en mémoire diff --git a/src/utils.cc b/src/utils.cc index 65963f7..12d95a8 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -244,11 +244,11 @@ void Utils::GetPath(char *Path) sprintf(Path,"./%s",Provi); if(Utils::FileExiste(Path)) return; - sprintf(Path,"/usr/local/share/Ri-li/%s",Provi); + sprintf(Path,"/usr/local/share/Li-ri/%s",Provi); if(Utils::FileExiste(Path)) return; - sprintf(Path,"/usr/share/Ri-li/%s",Provi); + sprintf(Path,"/usr/share/Li-ri/%s",Provi); if(Utils::FileExiste(Path)) return; - sprintf(Path,"/usr/share/games/Ri-li/%s",Provi); + sprintf(Path,"/usr/share/games/Li-ri/%s",Provi); if(Utils::FileExiste(Path)) return; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find '%s'", Provi); @@ -279,7 +279,7 @@ void Utils::GetPath(char *Path) strcpy(Provi,Path); - sprintf(Path,"Ri-li.app/Contents/Resources/%s",Provi); + sprintf(Path,"Li-ri.app/Contents/Resources/%s",Provi); if(Utils::FileExiste(Path)) return; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find '%s'", Path); @@ -301,8 +301,8 @@ bool Utils::LoadPref(void) unsigned char *Provi; char PathPref[512]; - char *PrefFolder = SDL_GetPrefPath("Ri-Li", "Ri-Li"); - sprintf(PathPref, "%sri-li.pref", PrefFolder); + char *PrefFolder = SDL_GetPrefPath("Li-Ri", "Li-Ri"); + sprintf(PathPref, "%sli-ri.pref", PrefFolder); SDL_free(PrefFolder); @@ -323,8 +323,8 @@ bool Utils::LoadPref(void) void Utils::SauvePref(void) { char PathPref[512]; - char *PrefFolder = SDL_GetPrefPath("Ri-Li", "Ri-Li"); - sprintf(PathPref, "%sri-li.pref", PrefFolder); + char *PrefFolder = SDL_GetPrefPath("Li-Ri", "Li-Ri"); + sprintf(PathPref, "%sli-ri.pref", PrefFolder); SDL_free(PrefFolder); Utils::SauveFichier(PathPref,(char*)&Pref,sizeof(sPreference));