From fcd859208a9a9cbd3a0679649e03922a15761607 Mon Sep 17 00:00:00 2001 From: Hans-Peter Jansen Date: Mon, 24 Oct 2022 19:30:58 +0200 Subject: [PATCH 1/2] disable default executable stack with i586 builds --- src/assembler.S | 5 +++++ src/assembler_opt.S | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/assembler.S b/src/assembler.S index 1d6c6de..35d091c 100644 --- a/src/assembler.S +++ b/src/assembler.S @@ -2076,3 +2076,8 @@ _et_col1: .int 0 #11 _et_col2: .int 0 #13 #_et_col1: .byte 11 #_et_col2: .byte 13 + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif + diff --git a/src/assembler_opt.S b/src/assembler_opt.S index 9bab646..94526b9 100644 --- a/src/assembler_opt.S +++ b/src/assembler_opt.S @@ -407,3 +407,6 @@ _COPY2X32BITS_512x440: leave ret +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif From 940614ba8c8b054faea7c9823f0dfe8e993a036f Mon Sep 17 00:00:00 2001 From: Hans-Peter Jansen Date: Sun, 14 Apr 2024 23:22:21 +0200 Subject: [PATCH 2/2] Enable changing the difficulty via config file --- src/config_file.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/config_file.c b/src/config_file.c index a099f7a..3a5896f 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -293,6 +293,14 @@ configfile_load (void) { power_conf->verbose = 0; } + if (!lisp_read_int (lst, "difficulty", &power_conf->difficulty)) + { + power_conf->difficulty = 1; + } + if (power_conf->difficulty < 0 || power_conf->difficulty > 2) + { + power_conf->difficulty = 1; + } if (!lisp_read_int (lst, "scale_x", &power_conf->scale_x)) { power_conf->scale_x = 2;