summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/map/35
-rw-r--r--src/game.c2
-rw-r--r--src/map.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/data/map/3 b/data/map/3
index 1f8679c..5775c91 100644
--- a/data/map/3
+++ b/data/map/3
@@ -5,8 +5,8 @@ b7^ $ . ^1^3. . . .3.3. . . . . ^1bab1bc
b7. . . . . $1* $ .3.3. * ;2$ . . ^ bab1
d7.3.3.3.3.3.3.3.3.3.3. . . . . . . ^2b5
d6.3.3.3.3.3.3.3.3.3.3. . . . . . . . b5
-b7. . . . . $1* . .3.3$ * ;4;2. . ;2;4b5
-b7^1. . . ^3. . . .3.3. . ;5. . . . ;5b5
+b7. . . . . $1* . .3.3$ * ^ ^2. . . ^ b5
+b7^1. $ . ^3. . . .3.3. . ^3. . . . ^1b5
b2b6b6b6b6b9^2. . .3.3. ^ . . . . . . b5
b0b4b4b4b1b7. * $ .3.3. * $1. . . . . b5
b7^3. ^2b5b7. . . .3.3.3.3.3.3.3.3.3.3d2
@@ -24,6 +24,7 @@ b2b6b6b6b3b2b6b9r8r6r6r9b8b6b6b6b6b6b6b3
+000+000
+000+150
+000-100
+-200+000
+000+100
+000-150
+000+000
diff --git a/src/game.c b/src/game.c
index 1d5e2d6..0b9edc0 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3,8 +3,8 @@
#include "globals.h"
#include "map.h"
#include <SDL2/SDL.h>
-#include <stdio.h>
#include <math.h>
+#include <stdio.h>
int magic = 0;
int lenin_size = 0;
diff --git a/src/map.c b/src/map.c
index d602e29..60bc0fc 100644
--- a/src/map.c
+++ b/src/map.c
@@ -287,7 +287,7 @@ static void loadroom(tt_room *r, FILE *f)
b->txrcol = id;
b->anim = 4;
b->rate = 100 + (rand() % 50 - 25);
- b->collision_act = /*colact_gulag*/ 0;
+ b->collision_act = colact_gulag;
b->isdoor = 0;
}
}