Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions AUTHORS
Original file line numberDiff line numberDiff line change
@@ -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 <jazeix@gmail.com>: port to SDL2 + android

Copyright (c) 2006
Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website.
Expand Down
6 changes: 4 additions & 2 deletions README
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.rili.app"
package="org.liri.app"
android:versionCode="30000"
android:versionName="3.0.0"
android:installLocation="auto">
Expand All@@ -12,7 +12,7 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" >
<activity android:name="RiLi"
<activity android:name="LiRi"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
android:label="@string/app_name"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
package org.rili.app;
package org.liri.app;

import org.libsdl.app.SDLActivity;

Expand All@@ -9,7 +9,7 @@
* A sample wrapper class that just calls SDLActivity
*/

public class RiLi extends SDLActivity {
public class LiRi extends SDLActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Ri-Li</string>
<string name="app_name">Li-Ri</string>
</resources>
2 changes: 1 addition & 1 deletion configure
Original file line numberDiff line numberDiff line change
Expand Up@@ -2980,7 +2980,7 @@ fi


# Define the identity of the package.
PACKAGE=Ri-li
PACKAGE=Li-ri
VERSION=3.0.0


Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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])
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
2 changes: 1 addition & 1 deletion data/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
File renamed without changes.
Binary file modifieddata/sprites.dat
Binary file not shown.
4 changes: 3 additions & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line numberDiff line numberDiff line change
@@ -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,
Expand All@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/short_description.txt
Original file line numberDiff line numberDiff line change
@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/title.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
Ri-Li
Li-Ri
2 changes: 1 addition & 1 deletion gentoo/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 2 additions & 2 deletions gentoo/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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)
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/utils.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -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);
Expand All@@ -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);

Expand All@@ -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));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions AUTHORS
Original file line numberDiff line numberDiff line change
@@ -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 <jazeix@gmail.com>: port to SDL2 + android

Copyright (c) 2006
Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website.
Expand Down
6 changes: 4 additions & 2 deletions README
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.rili.app"
package="org.liri.app"
android:versionCode="30000"
android:versionName="3.0.0"
android:installLocation="auto">
Expand All@@ -12,7 +12,7 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" >
<activity android:name="RiLi"
<activity android:name="LiRi"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
android:label="@string/app_name"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
package org.rili.app;
package org.liri.app;

import org.libsdl.app.SDLActivity;

Expand All@@ -9,7 +9,7 @@
* A sample wrapper class that just calls SDLActivity
*/

public class RiLi extends SDLActivity {
public class LiRi extends SDLActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Ri-Li</string>
<string name="app_name">Li-Ri</string>
</resources>
2 changes: 1 addition & 1 deletion configure
Original file line numberDiff line numberDiff line change
Expand Up@@ -2980,7 +2980,7 @@ fi


# Define the identity of the package.
PACKAGE=Ri-li
PACKAGE=Li-ri
VERSION=3.0.0


Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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])
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
2 changes: 1 addition & 1 deletion data/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
File renamed without changes.
Binary file modifieddata/sprites.dat
Binary file not shown.
4 changes: 3 additions & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line numberDiff line numberDiff line change
@@ -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,
Expand All@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/short_description.txt
Original file line numberDiff line numberDiff line change
@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/title.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
Ri-Li
Li-Ri
2 changes: 1 addition & 1 deletion gentoo/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 2 additions & 2 deletions gentoo/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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)
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/utils.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -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);
Expand All@@ -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);

Expand All@@ -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));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions AUTHORS
Original file line numberDiff line numberDiff line change
@@ -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 <jazeix@gmail.com>: port to SDL2 + android

Copyright (c) 2006
Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website.
Expand Down
6 changes: 4 additions & 2 deletions README
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.rili.app"
package="org.liri.app"
android:versionCode="30000"
android:versionName="3.0.0"
android:installLocation="auto">
Expand All@@ -12,7 +12,7 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" >
<activity android:name="RiLi"
<activity android:name="LiRi"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
android:label="@string/app_name"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
package org.rili.app;
package org.liri.app;

import org.libsdl.app.SDLActivity;

Expand All@@ -9,7 +9,7 @@
* A sample wrapper class that just calls SDLActivity
*/

public class RiLi extends SDLActivity {
public class LiRi extends SDLActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Ri-Li</string>
<string name="app_name">Li-Ri</string>
</resources>
2 changes: 1 addition & 1 deletion configure
Original file line numberDiff line numberDiff line change
Expand Up@@ -2980,7 +2980,7 @@ fi


# Define the identity of the package.
PACKAGE=Ri-li
PACKAGE=Li-ri
VERSION=3.0.0


Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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])
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
2 changes: 1 addition & 1 deletion data/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
File renamed without changes.
Binary file modifieddata/sprites.dat
Binary file not shown.
4 changes: 3 additions & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line numberDiff line numberDiff line change
@@ -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,
Expand All@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/short_description.txt
Original file line numberDiff line numberDiff line change
@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/title.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
Ri-Li
Li-Ri
2 changes: 1 addition & 1 deletion gentoo/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 2 additions & 2 deletions gentoo/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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)
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/utils.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -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);
Expand All@@ -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);

Expand All@@ -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));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions AUTHORS
Original file line numberDiff line numberDiff line change
@@ -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 <jazeix@gmail.com>: port to SDL2 + android

Copyright (c) 2006
Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website.
Expand Down
6 changes: 4 additions & 2 deletions README
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.rili.app"
package="org.liri.app"
android:versionCode="30000"
android:versionName="3.0.0"
android:installLocation="auto">
Expand All@@ -12,7 +12,7 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" >
<activity android:name="RiLi"
<activity android:name="LiRi"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
android:label="@string/app_name"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
package org.rili.app;
package org.liri.app;

import org.libsdl.app.SDLActivity;

Expand All@@ -9,7 +9,7 @@
* A sample wrapper class that just calls SDLActivity
*/

public class RiLi extends SDLActivity {
public class LiRi extends SDLActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Ri-Li</string>
<string name="app_name">Li-Ri</string>
</resources>
2 changes: 1 addition & 1 deletion configure
Original file line numberDiff line numberDiff line change
Expand Up@@ -2980,7 +2980,7 @@ fi


# Define the identity of the package.
PACKAGE=Ri-li
PACKAGE=Li-ri
VERSION=3.0.0


Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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])
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
2 changes: 1 addition & 1 deletion data/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
File renamed without changes.
Binary file modifieddata/sprites.dat
Binary file not shown.
4 changes: 3 additions & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line numberDiff line numberDiff line change
@@ -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,
Expand All@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/short_description.txt
Original file line numberDiff line numberDiff line change
@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/title.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
Ri-Li
Li-Ri
2 changes: 1 addition & 1 deletion gentoo/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 2 additions & 2 deletions gentoo/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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)
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/utils.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -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);
Expand All@@ -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);

Expand All@@ -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));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions AUTHORS
Original file line numberDiff line numberDiff line change
@@ -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 <jazeix@gmail.com>: port to SDL2 + android

Copyright (c) 2006
Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website.
Expand Down
6 changes: 4 additions & 2 deletions README
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.rili.app"
package="org.liri.app"
android:versionCode="30000"
android:versionName="3.0.0"
android:installLocation="auto">
Expand All@@ -12,7 +12,7 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" >
<activity android:name="RiLi"
<activity android:name="LiRi"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
android:label="@string/app_name"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
package org.rili.app;
package org.liri.app;

import org.libsdl.app.SDLActivity;

Expand All@@ -9,7 +9,7 @@
* A sample wrapper class that just calls SDLActivity
*/

public class RiLi extends SDLActivity {
public class LiRi extends SDLActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Ri-Li</string>
<string name="app_name">Li-Ri</string>
</resources>
2 changes: 1 addition & 1 deletion configure
Original file line numberDiff line numberDiff line change
Expand Up@@ -2980,7 +2980,7 @@ fi


# Define the identity of the package.
PACKAGE=Ri-li
PACKAGE=Li-ri
VERSION=3.0.0


Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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])
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
2 changes: 1 addition & 1 deletion data/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
File renamed without changes.
Binary file modifieddata/sprites.dat
Binary file not shown.
4 changes: 3 additions & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line numberDiff line numberDiff line change
@@ -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,
Expand All@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/short_description.txt
Original file line numberDiff line numberDiff line change
@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/title.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
Ri-Li
Li-Ri
2 changes: 1 addition & 1 deletion gentoo/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 2 additions & 2 deletions gentoo/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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)
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/utils.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -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);
Expand All@@ -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);

Expand All@@ -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));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions AUTHORS
Original file line numberDiff line numberDiff line change
@@ -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 <jazeix@gmail.com>: port to SDL2 + android

Copyright (c) 2006
Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website.
Expand Down
6 changes: 4 additions & 2 deletions README
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.rili.app"
package="org.liri.app"
android:versionCode="30000"
android:versionName="3.0.0"
android:installLocation="auto">
Expand All@@ -12,7 +12,7 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" >
<activity android:name="RiLi"
<activity android:name="LiRi"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
android:label="@string/app_name"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
package org.rili.app;
package org.liri.app;

import org.libsdl.app.SDLActivity;

Expand All@@ -9,7 +9,7 @@
* A sample wrapper class that just calls SDLActivity
*/

public class RiLi extends SDLActivity {
public class LiRi extends SDLActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Ri-Li</string>
<string name="app_name">Li-Ri</string>
</resources>
2 changes: 1 addition & 1 deletion configure
Original file line numberDiff line numberDiff line change
Expand Up@@ -2980,7 +2980,7 @@ fi


# Define the identity of the package.
PACKAGE=Ri-li
PACKAGE=Li-ri
VERSION=3.0.0


Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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])
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
2 changes: 1 addition & 1 deletion data/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
File renamed without changes.
Binary file modifieddata/sprites.dat
Binary file not shown.
4 changes: 3 additions & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line numberDiff line numberDiff line change
@@ -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,
Expand All@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/short_description.txt
Original file line numberDiff line numberDiff line change
@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/title.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
Ri-Li
Li-Ri
2 changes: 1 addition & 1 deletion gentoo/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 2 additions & 2 deletions gentoo/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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)
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/utils.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -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);
Expand All@@ -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);

Expand All@@ -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));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions AUTHORS
Original file line numberDiff line numberDiff line change
@@ -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 <jazeix@gmail.com>: port to SDL2 + android

Copyright (c) 2006
Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website.
Expand Down
6 changes: 4 additions & 2 deletions README
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.rili.app"
package="org.liri.app"
android:versionCode="30000"
android:versionName="3.0.0"
android:installLocation="auto">
Expand All@@ -12,7 +12,7 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" >
<activity android:name="RiLi"
<activity android:name="LiRi"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
android:label="@string/app_name"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
package org.rili.app;
package org.liri.app;

import org.libsdl.app.SDLActivity;

Expand All@@ -9,7 +9,7 @@
* A sample wrapper class that just calls SDLActivity
*/

public class RiLi extends SDLActivity {
public class LiRi extends SDLActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Ri-Li</string>
<string name="app_name">Li-Ri</string>
</resources>
2 changes: 1 addition & 1 deletion configure
Original file line numberDiff line numberDiff line change
Expand Up@@ -2980,7 +2980,7 @@ fi


# Define the identity of the package.
PACKAGE=Ri-li
PACKAGE=Li-ri
VERSION=3.0.0


Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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])
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
2 changes: 1 addition & 1 deletion data/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
File renamed without changes.
Binary file modifieddata/sprites.dat
Binary file not shown.
4 changes: 3 additions & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line numberDiff line numberDiff line change
@@ -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,
Expand All@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/short_description.txt
Original file line numberDiff line numberDiff line change
@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/title.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
Ri-Li
Li-Ri
2 changes: 1 addition & 1 deletion gentoo/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 2 additions & 2 deletions gentoo/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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)
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/utils.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -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);
Expand All@@ -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);

Expand All@@ -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));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions AUTHORS
Original file line numberDiff line numberDiff line change
@@ -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 <jazeix@gmail.com>: port to SDL2 + android

Copyright (c) 2006
Dominique Roux-Serret: roux-serret@ifrance.com : design & programming & graphics & website.
Expand Down
6 changes: 4 additions & 2 deletions README
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.rili.app"
package="org.liri.app"
android:versionCode="30000"
android:versionName="3.0.0"
android:installLocation="auto">
Expand All@@ -12,7 +12,7 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" >
<activity android:name="RiLi"
<activity android:name="LiRi"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
android:label="@string/app_name"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
package org.rili.app;
package org.liri.app;

import org.libsdl.app.SDLActivity;

Expand All@@ -9,7 +9,7 @@
* A sample wrapper class that just calls SDLActivity
*/

public class RiLi extends SDLActivity {
public class LiRi extends SDLActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Ri-Li</string>
<string name="app_name">Li-Ri</string>
</resources>
2 changes: 1 addition & 1 deletion configure
Original file line numberDiff line numberDiff line change
Expand Up@@ -2980,7 +2980,7 @@ fi


# Define the identity of the package.
PACKAGE=Ri-li
PACKAGE=Li-ri
VERSION=3.0.0


Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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])
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
2 changes: 1 addition & 1 deletion data/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
File renamed without changes.
Binary file modifieddata/sprites.dat
Binary file not shown.
4 changes: 3 additions & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line numberDiff line numberDiff line change
@@ -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,
Expand All@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/short_description.txt
Original file line numberDiff line numberDiff line change
@@ -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.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/title.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
Ri-Li
Li-Ri
2 changes: 1 addition & 1 deletion gentoo/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 2 additions & 2 deletions gentoo/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line numberDiff line numberDiff line change
@@ -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
20 changes: 10 additions & 10 deletions src/Makefile.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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)
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/utils.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -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);
Expand All@@ -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);

Expand All@@ -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));
Expand Down