From: Holger Schemel Date: Tue, 26 Sep 2000 22:29:05 +0000 (+0200) Subject: rnd-20000927-1-src X-Git-Tag: 2.0.0^2~40 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=2d57e3c2b6241f64246029e78b4b004b4a0ebf2f;p=rocksndiamonds.git rnd-20000927-1-src --- diff --git a/src/events.c b/src/events.c index 7da6e553..470271cb 100644 --- a/src/events.c +++ b/src/events.c @@ -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: diff --git a/src/init.c b/src/init.c index c591c0db..4d3a034d 100644 --- a/src/init.c +++ b/src/init.c @@ -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