diff --git a/Makefile b/Makefile index 07a91b8..061f50f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ include config.make VERTITLE := instead-$(VERSION) ARCHIVE := instead_$(VERSION).tar.gz# -SUBDIRS += src/sdl-instead stead games themes icon desktop doc languages +SUBDIRS += src/sdl-instead stead games themes icon desktop doc lang all: @for dir in $(SUBDIRS); do \ diff --git a/Makefile.mingw b/Makefile.mingw index 81b9b1e..0011b58 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -28,7 +28,7 @@ install: all $(MAKE) DESTDIR=../bin/ -C games install $(MAKE) DESTDIR=../bin/ -C stead install $(MAKE) DESTDIR=../bin/ -C icon install - $(MAKE) DESTDIR=../bin/ -C languages install + $(MAKE) DESTDIR=../bin/ -C lang install $(MAKE) DESTDIR=../bin/ -C doc install setup: install docs diff --git a/Makefile.mingw32ce b/Makefile.mingw32ce index 780bb24..58fd6f4 100644 --- a/Makefile.mingw32ce +++ b/Makefile.mingw32ce @@ -9,7 +9,7 @@ THEMESPATH=$(DESTDIR)$(PREFIX)themes GAMESPATH=$(DESTDIR)$(PREFIX)games ICONPATH=$(DESTDIR)$(PREFIX)icon DOCPATH=$(DESTDIR)$(PREFIX)doc -LANGPATH=$(DESTDIR)$(PREFIX)languages +LANGPATH=$(DESTDIR)$(PREFIX)lang MANPATH=$(DESTDIR)$(PREFIX)doc ZLIB_CFLAGS= diff --git a/Makefile.windows b/Makefile.windows index 075e428..e90e9e5 100644 --- a/Makefile.windows +++ b/Makefile.windows @@ -19,5 +19,5 @@ install: all $(MAKE) -C games -f Makefile.windows install $(MAKE) -C stead -f Makefile.windows install $(MAKE) -C icon -f Makefile.windows install - $(MAKE) -C languages -f Makefile.windows install + $(MAKE) -C lang -f Makefile.windows install $(MAKE) -C doc -f Makefile.windows install diff --git a/Rules.make.macosx b/Rules.make.macosx index 0790fb4..4febee3 100644 --- a/Rules.make.macosx +++ b/Rules.make.macosx @@ -7,7 +7,7 @@ STEADPATH=$(DATAPATH)/stead THEMESPATH=$(DATAPATH)/themes GAMESPATH=$(DATAPATH)/games ICONPATH=$(DATAPATH)/icon -LANGPATH=$(DATAPATH)/languages +LANGPATH=$(DATAPATH)/lang DOCPATH= MANPATH= SYSTEMSETUP=no diff --git a/Rules.make.standalone b/Rules.make.standalone index f6884a8..2f7b4a8 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -7,7 +7,7 @@ STEADPATH=$(DATAPATH)/stead THEMESPATH=$(DATAPATH)/themes GAMESPATH=$(DATAPATH)/games ICONPATH=$(DATAPATH)/icon -LANGPATH=$(DATAPATH)/languages +LANGPATH=$(DATAPATH)/lang DOCPATH= MANPATH= SYSTEMSETUP=no diff --git a/Rules.make.system b/Rules.make.system index e36d1e1..a40b07e 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -9,7 +9,7 @@ THEMESPATH=$(DATAPATH)/themes GAMESPATH=$(DATAPATH)/games ICONPATH=$(DESTDIR)$(PREFIX)/share/pixmaps DOCPATH=$(DESTDIR)$(PREFIX)/share/doc/instead -LANGPATH=$(DATAPATH)/languages +LANGPATH=$(DATAPATH)/lang MANPATH=$(DESTDIR)$(PREFIX)/share/man/man6 SYSTEMSETUP=yes diff --git a/Rules.mingw b/Rules.mingw index aaf85c8..d9c8236 100644 --- a/Rules.mingw +++ b/Rules.mingw @@ -9,7 +9,7 @@ THEMESPATH=$(DESTDIR)$(PREFIX)themes GAMESPATH=$(DESTDIR)$(PREFIX)games ICONPATH=$(DESTDIR)$(PREFIX)icon DOCPATH=$(DESTDIR)$(PREFIX)doc -LANGPATH=$(DESTDIR)$(PREFIX)languages +LANGPATH=$(DESTDIR)$(PREFIX)lang MANPATH=$(DESTDIR)$(PREFIX)doc ZLIB_CFLAGS=-I../zlib diff --git a/Rules.windows b/Rules.windows index 9a45b17..9147d9d 100644 --- a/Rules.windows +++ b/Rules.windows @@ -9,7 +9,7 @@ STEADPATH=$(DATAPATH)/stead THEMESPATH=$(DATAPATH)/themes/ GAMESPATH=$(DATAPATH)/games ICONPATH=$(DATAPATH)/icon -LANGPATH=$(DATAPATH)/languages +LANGPATH=$(DATAPATH)/lang ZLIB_CFLAGS=-I../zlib ZLIB_LFLAGS=../zlib/libz.a diff --git a/configure.sh b/configure.sh index bcb7093..4bbbbc1 100755 --- a/configure.sh +++ b/configure.sh @@ -203,7 +203,7 @@ elif [ "x$ans" = "x2" ]; then echo "GAMESPATH=\$(DATAPATH)/games" >> config.make echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make - echo "LANGPATH=\$(DATAPATH)/languages" >> config.make + echo "LANGPATH=\$(DATAPATH)/lang" >> config.make echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make echo "Ok. We are ready to build and install. Use these commands:" diff --git a/instead.pkg b/instead.pkg index c299b51..40130a0 100644 --- a/instead.pkg +++ b/instead.pkg @@ -59,8 +59,8 @@ ".\symbian_gamedata\stead\para.lua" -"!:\data\instead\stead\para.lua" ".\symbian_gamedata\stead\theme.lua" -"!:\data\instead\stead\theme.lua" ".\symbian_gamedata\stead\prefs.lua" -"!:\data\instead\stead\prefs.lua" -".\symbian_gamedata\languages\ru.ini" -"!:\data\instead\languages\ru.ini" -".\symbian_gamedata\languages\en.ini" -"!:\data\instead\languages\en.ini" +".\symbian_gamedata\lang\ru.ini" -"!:\data\instead\lang\ru.ini" +".\symbian_gamedata\lang\en.ini" -"!:\data\instead\lang\en.ini" ".\symbian_gamedata\themes\fantasy\down.png" -"!:\data\instead\themes\fantasy\down.png" ".\symbian_gamedata\themes\fantasy\up.png" -"!:\data\instead\themes\fantasy\up.png" ".\symbian_gamedata\themes\fantasy\menu.png" -"!:\data\instead\themes\fantasy\menu.png" diff --git a/languages/Makefile b/lang/Makefile similarity index 100% rename from languages/Makefile rename to lang/Makefile diff --git a/lang/Makefile.windows b/lang/Makefile.windows new file mode 100644 index 0000000..cc7678f --- /dev/null +++ b/lang/Makefile.windows @@ -0,0 +1,7 @@ +include ../Rules.make + +clean: +all: +install: + if not exist ..\bin\lang mkdir ..\bin\lang + copy /Y *.ini ..\bin\lang diff --git a/languages/en.ini b/lang/en.ini similarity index 100% rename from languages/en.ini rename to lang/en.ini diff --git a/languages/es.ini b/lang/es.ini similarity index 100% rename from languages/es.ini rename to lang/es.ini diff --git a/languages/it.ini b/lang/it.ini similarity index 100% rename from languages/it.ini rename to lang/it.ini diff --git a/languages/ru.ini b/lang/ru.ini similarity index 100% rename from languages/ru.ini rename to lang/ru.ini diff --git a/languages/Makefile.windows b/languages/Makefile.windows deleted file mode 100644 index b0261f9..0000000 --- a/languages/Makefile.windows +++ /dev/null @@ -1,7 +0,0 @@ -include ../Rules.make - -clean: -all: -install: - if not exist ..\bin\languages mkdir ..\bin\languages - copy /Y *.ini ..\bin\languages diff --git a/setup-kit.iss b/setup-kit.iss index 8ae0216..e7c7159 100644 --- a/setup-kit.iss +++ b/setup-kit.iss @@ -26,7 +26,7 @@ Source: icon\*; DestDir: {app}\icon Source: doc\*; DestDir: {app}\doc Source: doc\modules\*; DestDir: {app}\doc\modules Source: stead\*; DestDir: {app}\stead -Source: languages\*; DestDir: {app}\languages +Source: lang\*; DestDir: {app}\lang Source: themes\default\*; DestDir: {app}\themes\default Source: themes\book\*; DestDir: {app}\themes\book Source: themes\original\*; DestDir: {app}\themes\original diff --git a/setup.iss b/setup.iss index 3ba1794..da87cfd 100644 --- a/setup.iss +++ b/setup.iss @@ -23,7 +23,7 @@ Source: icon\*; DestDir: {app}\icon Source: doc\*; DestDir: {app}\doc Source: doc\modules\*; DestDir: {app}\doc\modules Source: stead\*; DestDir: {app}\stead -Source: languages\*; DestDir: {app}\languages +Source: lang\*; DestDir: {app}\lang Source: themes\default\*; DestDir: {app}\themes\default Source: themes\book\*; DestDir: {app}\themes\book Source: themes\original\*; DestDir: {app}\themes\original diff --git a/src/sdl-instead/graphics.c b/src/sdl-instead/graphics.c index 94b03fc..e1ba80b 100644 --- a/src/sdl-instead/graphics.c +++ b/src/sdl-instead/graphics.c @@ -2962,11 +2962,15 @@ img_t get_img(struct layout *layout, char *p, int *al) if (!p[align]) align = 0; else { - p[align] = 0; if (!strcmp(p + align + 1, "left")) *al = ALIGN_LEFT; else if (!strcmp(p + align + 1, "right")) *al = ALIGN_RIGHT; + if (*al) { + p[align] = 0; + if (align && p[align - 1] == '\\') + p[align - 1] = 0; + } } img = layout_lookup_image(layout, p); if (img) diff --git a/src/sdl-instead/s60.h b/src/sdl-instead/s60.h index 3c07f01..63c0f29 100644 --- a/src/sdl-instead/s60.h +++ b/src/sdl-instead/s60.h @@ -7,5 +7,5 @@ #define THEMES_PATH DATAPATH"themes/" #define GAMES_PATH DATAPATH"games/" #define ICON_PATH DATAPATH"icon/" -#define LANG_PATH DATAPATH"languages/" +#define LANG_PATH DATAPATH"lang/" #endif diff --git a/stead/gui.lua b/stead/gui.lua index 4065911..07b1cba 100644 --- a/stead/gui.lua +++ b/stead/gui.lua @@ -53,12 +53,12 @@ end; iface.imgl = function(self, str) if str == nil then return nil; end; - return ""; + return ""; end; iface.imgr = function(self, str) if str == nil then return nil; end; - return ""; + return ""; end; iface.nb = function(self, str)