Mercurial > molko
changeset 257:251de91394b7
rpg: fix invalid use of %c in sscanf
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 05 Dec 2020 15:03:09 +0100 |
parents | 9dcb9354dc74 |
children | f978fa0137ce |
files | libmlk-rpg/rpg/map-file.c libmlk-rpg/rpg/tileset-file.c |
diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libmlk-rpg/rpg/map-file.c Sat Dec 05 14:20:57 2020 +0100 +++ b/libmlk-rpg/rpg/map-file.c Sat Dec 05 15:03:09 2020 +0100 @@ -34,9 +34,8 @@ #include "map-file.h" #include "rpg_p.h" -/* Create %<v>c string literal for scanf */ #define MAX_F(v) MAX_F_(v) -#define MAX_F_(v) "%" #v "c" +#define MAX_F_(v) "%" #v "[^\n|]" struct context { struct map_file *mf; /* Map loader. */
--- a/libmlk-rpg/rpg/tileset-file.c Sat Dec 05 14:20:57 2020 +0100 +++ b/libmlk-rpg/rpg/tileset-file.c Sat Dec 05 15:03:09 2020 +0100 @@ -37,7 +37,7 @@ #include "tileset.h" #define MAX_F(v) MAX_F_(v) -#define MAX_F_(v) "%" #v "[^|]" +#define MAX_F_(v) "%" #v "[^\n|]" /* * This is how memory for animations is allocated in the tileset_file