added not using touch buttons if touch controls are disabled

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 1fd4b463ce1280b3a93fdf5c69aa2aefac166ae0..e5d956709d9408f9c96090a185d2677de2669727 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -5610,7 +5610,7 @@ static char *getElementInfoText(int element)
 
 static char *getElementDescriptionFilenameExt(char *basename)
 {
-  char *elements_subdir = "elements";
+  char *elements_subdir = ELEMENTS_DIRECTORY;
   static char *elements_subdir2 = NULL;
   static char *filename = NULL;
 
@@ -5651,6 +5651,11 @@ static char *getElementDescriptionFilename(int element)
   if (filename != NULL)
     return filename;
 
+  // 3rd try: look for generic fallback text file for any element
+  filename = getElementDescriptionFilenameExt(FALLBACK_TEXT_FILENAME);
+  if (filename != NULL)
+    return filename;
+
   return NULL;
 }