From 45bc160ef40f97cabf1166cd9d123e2ef1b9ed44 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Mon, 30 Sep 2024 11:16:26 +0200 Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20Si=20nom=C3=A9s=20quedaba=20el=20he?= =?UTF-8?q?roi=20al=20canviar=20d'habitaci=C3=B3,=20petava=20-=20[FIX]=20A?= =?UTF-8?q?lgunes=20cap=C3=A7aleres=20mal=20-=20Lagueirto=20en=20proves?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + data/rooms/47.txt | 4 ++-- lagueirtofile | 5 +++++ source/actor.cpp | 2 +- source/jdraw.cpp | 2 +- source/main.cpp | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 lagueirtofile diff --git a/.gitignore b/.gitignore index 57efe02..1411016 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ *.dll .vscode/* *.dSYM/* +build/* thepool thepool_debug \ No newline at end of file diff --git a/data/rooms/47.txt b/data/rooms/47.txt index 14a2fb8..7486e84 100644 --- a/data/rooms/47.txt +++ b/data/rooms/47.txt @@ -1,5 +1,5 @@ -width: 2 -height: 2 +width: 3 +height: 3 color: CYAN floor-texture: 0 wall-texture: 0 diff --git a/lagueirtofile b/lagueirtofile new file mode 100644 index 0000000..712f892 --- /dev/null +++ b/lagueirtofile @@ -0,0 +1,5 @@ +libs = -lSDL2 -lSDL2_mixer +cppflags = -D DEBUG -g +executable = thepool_debug +sourcepath = source +buildpath = build diff --git a/source/actor.cpp b/source/actor.cpp index 649ae14..7ec8972 100644 --- a/source/actor.cpp +++ b/source/actor.cpp @@ -418,7 +418,7 @@ namespace actor void setDirty(actor_t *act, const bool force) { - if (!act->prev && !act->next) + if (!act->prev && !act->next && !(act==first)) { act->next = first; if (first) first->prev = act; diff --git a/source/jdraw.cpp b/source/jdraw.cpp index 54acf7f..a326157 100644 --- a/source/jdraw.cpp +++ b/source/jdraw.cpp @@ -1,5 +1,5 @@ #include "jdraw.h" -#include "SDL2/SDL.h" +#include #include "gif.c" #include "jfile.h" #include diff --git a/source/main.cpp b/source/main.cpp index e7ba144..0542aae 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -4,7 +4,7 @@ #include "jinput.h" #include "editor.h" #include "console.h" -#include "string.h" +#include #include "config.h" #include