rnd-20000927-1-src
authorHolger Schemel <info@artsoft.org>
Tue, 26 Sep 2000 22:29:05 +0000 (00:29 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:34:57 +0000 (10:34 +0200)
src/events.c
src/init.c

index 7da6e5536c058fb79e9598f4a8a95e10de3cee7c..470271cbefe3a68b6de54c4fc79d1a6d9b23cc6c 100644 (file)
@@ -426,6 +426,7 @@ void HandleButton(int mx, int my, int button)
 void HandleKey(Key key, int key_status)
 {
   int joy = 0;
+  boolean anyTextGadgetActiveOrJustFinished = anyTextGadgetActive();
   static struct SetupKeyboardInfo custom_key;
   static struct
   {
@@ -589,7 +590,8 @@ void HandleKey(Key key, int key_status)
       break;
 
     case LEVELED:
-      HandleLevelEditorKeyInput(key);
+      if (!anyTextGadgetActiveOrJustFinished)
+       HandleLevelEditorKeyInput(key);
       break;
 
     case PLAYING:
index c591c0db5634dd3f660c7c404c2e9aac58cbc7a2..4d3a034ddb626e79c8528a4c4d435abcfd985856 100644 (file)
@@ -2204,7 +2204,7 @@ void InitElementProperties()
     for(j=0; j<*(ep2_num[i]); j++)
       Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
 
-  for(i=EL_CHAR_START; i<EL_CHAR_END; i++)
+  for(i=EL_CHAR_START; i<=EL_CHAR_END; i++)
     Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }