Fullscreen, etc...

1 files changed, 220 insertions, 222 deletions

diff --git a/src/map.c b/src/map.c
index 5a6f618..557a6f5 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,12 +1,11 @@
 #include "map.h"
 
+#include "game.h"
+#include "globals.h"
+#include "room.h"
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_mixer.h>
 #include <stdio.h>
-#include "room.h"
-#include "globals.h"
-#include "game.h"
-
 
 static int readnum(FILE *f)
 {
@@ -22,20 +21,19 @@ static int readnum(FILE *f)
 static SDL_Rect *newtile(int row, int col)
 {
     SDL_Rect *r = malloc(sizeof(*r));
-    r->x = 16 * col;
-    r->y = 16 * row;
+    r->x        = 16 * col;
+    r->y        = 16 * row;
     r->h = r->w = 16;
     return r;
 }
 
-
 static void loadroom(tt_room *r, FILE *f)
 {
     int default_floor_id = fgetc(f) - '0';
     fgetc(f);
     int i, j;
     for (i = 0; i != 4; ++i) r->neighbours[i] = ttmap + fgetc(f);
-    r->bodies = 0;
+    r->bodies       = 0;
     r->bodies_count = 0;
     fgetc(f);
     for (i = 0; i != TT_ROOM_H; ++i) {
@@ -45,265 +43,266 @@ static void loadroom(tt_room *r, FILE *f)
             int c    = id;
             if (id == ' ') id = '0';
             if (id < 'a') id -= '0';
-            else id = id - 'a' + 10;
+            else
+                id = id - 'a' + 10;
             r->floor[i][j] = 0;
             r->walls[i][j] = 0;
             if (type == '@') {
-                ttplayer.room = r;
-                ttplayer.x = j * 32;
-                ttplayer.y = i * 32;
-                ttplayer.xrem = 0;
-                ttplayer.yrem = 0;
-                ttplayer.xwalk = 0;
-                ttplayer.ywalk = 0;
-                ttplayer.rem = 0;
-                ttplayer.money = 0;
-                ttplayer.keys[0] = 0;
-                ttplayer.keys[1] = 0;
-                ttplayer.lenin_pos = 32 * 9;
+                ttplayer.room          = r;
+                ttplayer.x             = j * 32;
+                ttplayer.y             = i * 32;
+                ttplayer.xrem          = 0;
+                ttplayer.yrem          = 0;
+                ttplayer.xwalk         = 0;
+                ttplayer.ywalk         = 0;
+                ttplayer.rem           = 0;
+                ttplayer.money         = 0;
+                ttplayer.keys[0]       = 0;
+                ttplayer.keys[1]       = 0;
+                ttplayer.lenin_pos     = 32 * 9;
                 ttplayer.lenin_pos_rem = 0;
-                ttplayer.lenin_zhiv = 0;
-                ttplayer.lenin_rem = 0;
-                ttplayer.lenin_vel = -53;
-                ttplayer.variant = 0;
-                ttplayer.tobein_gulag = 0;
-                ttplayer.until_gulag = 5300;
-                r->floor[i][j] = newtile(0, default_floor_id);
+                ttplayer.lenin_zhiv    = 0;
+                ttplayer.lenin_rem     = 0;
+                ttplayer.lenin_vel     = -53;
+                ttplayer.variant       = 0;
+                ttplayer.tobein_gulag  = 0;
+                ttplayer.until_gulag   = 5300;
+                r->floor[i][j]         = newtile(0, default_floor_id);
             } else if (type == 'y') {
-                r->walls[i][j] = malloc(sizeof(tt_body));
-                tt_body *b = r->walls[i][j];
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->xvel = 0;
-                b->yvel = 0;
-                b->rem = 0;
-                b->txrrow = 2;
-                b->txrcol = id;
-                b->anim = 1;
-                b->rate = 1;
+                r->walls[i][j]   = malloc(sizeof(tt_body));
+                tt_body *b       = r->walls[i][j];
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->xvel          = 0;
+                b->yvel          = 0;
+                b->rem           = 0;
+                b->txrrow        = 2;
+                b->txrcol        = id;
+                b->anim          = 1;
+                b->rate          = 1;
                 b->collision_act = 0;
-                b->isdoor = 0;
-                b->msg = 0;
-                b->msglen = 0;
+                b->isdoor        = 0;
+                b->msg           = 0;
+                b->msglen        = 0;
             } else if (type == 'b') {
-                r->walls[i][j] = malloc(sizeof(tt_body));
-                tt_body *b = r->walls[i][j];
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->xvel = 0;
-                b->yvel = 0;
-                b->rem = 0;
-                b->txrrow = 3;
-                b->txrcol = id;
-                b->anim = 1;
-                b->rate = 1;
+                r->walls[i][j]   = malloc(sizeof(tt_body));
+                tt_body *b       = r->walls[i][j];
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->xvel          = 0;
+                b->yvel          = 0;
+                b->rem           = 0;
+                b->txrrow        = 3;
+                b->txrcol        = id;
+                b->anim          = 1;
+                b->rate          = 1;
                 b->collision_act = 0;
-                b->isdoor = 0;
-                b->msg = 0;
-                b->msglen = 0;
+                b->isdoor        = 0;
+                b->msg           = 0;
+                b->msglen        = 0;
             } else if (type == 'r') {
-                r->walls[i][j] = malloc(sizeof(tt_body));
-                tt_body *b = r->walls[i][j];
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->xvel = 0;
-                b->yvel = 0;
-                b->rem = 0;
-                b->txrrow = 1;
-                b->txrcol = id;
-                b->anim = 1;
-                b->rate = 1;
+                r->walls[i][j]   = malloc(sizeof(tt_body));
+                tt_body *b       = r->walls[i][j];
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->xvel          = 0;
+                b->yvel          = 0;
+                b->rem           = 0;
+                b->txrrow        = 1;
+                b->txrcol        = id;
+                b->anim          = 1;
+                b->rate          = 1;
                 b->collision_act = 0;
-                b->isdoor = 0;
-                b->msg = 0;
-                b->msglen = 0;
+                b->isdoor        = 0;
+                b->msg           = 0;
+                b->msglen        = 0;
             } else if (type == 'g') {
                 r->floor[i][j] = newtile(0, default_floor_id);
                 r->bodies_count++;
-                r->bodies = realloc(r->bodies,
-                                    sizeof(tt_body) * r->bodies_count);
-                tt_body *b = r->bodies + r->bodies_count - 1;
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->xvel = 0;
-                b->yvel = 0;
-                b->rem = 0;
-                b->txrrow = 8;
-                b->txrcol = id;
-                b->anim = 4;
-                b->rate = 150 + (rand() % 50 - 25);
+                r->bodies =
+                    realloc(r->bodies, sizeof(tt_body) * r->bodies_count);
+                tt_body *b       = r->bodies + r->bodies_count - 1;
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->xvel          = 0;
+                b->yvel          = 0;
+                b->rem           = 0;
+                b->txrrow        = 8;
+                b->txrcol        = id;
+                b->anim          = 4;
+                b->rate          = 150 + (rand() % 50 - 25);
                 b->collision_act = colact_grib;
-                b->isdoor = 0;
-                b->msg = 0;
-                b->msglen = 0;
+                b->isdoor        = 0;
+                b->msg           = 0;
+                b->msglen        = 0;
             } else if (type == '^') {
-                r->floor[i][j] = newtile(0, default_floor_id);
-                r->walls[i][j] = malloc(sizeof(tt_body));
-                tt_body *b = r->walls[i][j];
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->xvel = 0;
-                b->yvel = 0;
-                b->rem = 0;
-                b->txrrow = 8;
-                b->txrcol = id;
-                b->anim = 4;
-                b->rate = 150 + (rand() % 50 - 25);
+                r->floor[i][j]   = newtile(0, default_floor_id);
+                r->walls[i][j]   = malloc(sizeof(tt_body));
+                tt_body *b       = r->walls[i][j];
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->xvel          = 0;
+                b->yvel          = 0;
+                b->rem           = 0;
+                b->txrrow        = 8;
+                b->txrcol        = id;
+                b->anim          = 4;
+                b->rate          = 150 + (rand() % 50 - 25);
                 b->collision_act = 0;
-                b->isdoor = 0;
-                b->msg = 0;
-                b->msglen = 0;
+                b->isdoor        = 0;
+                b->msg           = 0;
+                b->msglen        = 0;
             } else if (type == ';') {
-                r->floor[i][j] = newtile(0, default_floor_id);
-                r->walls[i][j] = malloc(sizeof(tt_body));
-                tt_body *b = r->walls[i][j];
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->xvel = 0;
-                b->yvel = 0;
-                b->rem = 0;
-                b->txrrow = 10;
-                b->txrcol = id;
-                b->anim = 1;
-                b->rate = 100;
+                r->floor[i][j]   = newtile(0, default_floor_id);
+                r->walls[i][j]   = malloc(sizeof(tt_body));
+                tt_body *b       = r->walls[i][j];
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->xvel          = 0;
+                b->yvel          = 0;
+                b->rem           = 0;
+                b->txrrow        = 10;
+                b->txrcol        = id;
+                b->anim          = 1;
+                b->rate          = 100;
                 b->collision_act = 0;
-                b->isdoor = 0;
-                b->msg = 0;
-                b->msglen = 0;
+                b->isdoor        = 0;
+                b->msg           = 0;
+                b->msglen        = 0;
             } else if (type == '.') {
                 r->floor[i][j] = newtile(0, c == ' ' ? default_floor_id : id);
             } else if (type == '*') {
-                r->walls[i][j] = malloc(sizeof(tt_body));
-                tt_body *b = r->walls[i][j];
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->xvel = 0;
-                b->yvel = 0;
-                b->rem = 0;
-                b->txrrow = 9;
-                b->txrcol = id;
-                b->anim = 4;
-                b->rate = 150 + (rand() % 50 - 25);
+                r->walls[i][j]   = malloc(sizeof(tt_body));
+                tt_body *b       = r->walls[i][j];
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->xvel          = 0;
+                b->yvel          = 0;
+                b->rem           = 0;
+                b->txrrow        = 9;
+                b->txrcol        = id;
+                b->anim          = 4;
+                b->rate          = 150 + (rand() % 50 - 25);
                 b->collision_act = 0;
-                b->isdoor = 0;
-                b->msg = 0;
-                b->msglen = 0;
+                b->isdoor        = 0;
+                b->msg           = 0;
+                b->msglen        = 0;
             } else if (type == '=') {
                 r->floor[i][j] = newtile(0, default_floor_id);
                 r->bodies_count++;
-                r->bodies = realloc(r->bodies,
-                                    sizeof(tt_body) * r->bodies_count);
-                tt_body *b = r->bodies + r->bodies_count - 1;
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->rem = 0;
-                b->txrrow = 0;
-                b->txrcol = 15;
-                b->anim = 1;
-                b->rate = 100;
+                r->bodies =
+                    realloc(r->bodies, sizeof(tt_body) * r->bodies_count);
+                tt_body *b       = r->bodies + r->bodies_count - 1;
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->rem           = 0;
+                b->txrrow        = 0;
+                b->txrcol        = 15;
+                b->anim          = 1;
+                b->rate          = 100;
                 b->collision_act = 0;
-                b->isdoor = 0;
+                b->isdoor        = 0;
             } else if (type == 'k') {
                 r->floor[i][j] = newtile(0, default_floor_id);
                 r->bodies_count++;
-                r->bodies = realloc(r->bodies,
-                                    sizeof(tt_body) * r->bodies_count);
-                tt_body *b = r->bodies + r->bodies_count - 1;
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->rem = 0;
-                b->txrrow = 11;
-                b->txrcol = id;
-                b->anim = 1;
-                b->rate = 100;
+                r->bodies =
+                    realloc(r->bodies, sizeof(tt_body) * r->bodies_count);
+                tt_body *b       = r->bodies + r->bodies_count - 1;
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->rem           = 0;
+                b->txrrow        = 11;
+                b->txrcol        = id;
+                b->anim          = 1;
+                b->rate          = 100;
                 b->collision_act = colact_key;
-                b->isdoor = 0;
+                b->isdoor        = 0;
             } else if (type == 'd' || type == 'D') {
                 r->floor[i][j] = newtile(0, default_floor_id);
                 r->bodies_count++;
-                r->bodies = realloc(r->bodies,
-                                    sizeof(tt_body) * r->bodies_count);
-                tt_body *b = r->bodies + r->bodies_count - 1;
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->rem = 0;
-                b->txrrow = 4 + (type == 'D');
-                b->txrcol = id;
-                b->anim = 1;
-                b->rate = 100;
+                r->bodies =
+                    realloc(r->bodies, sizeof(tt_body) * r->bodies_count);
+                tt_body *b       = r->bodies + r->bodies_count - 1;
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->rem           = 0;
+                b->txrrow        = 4 + (type == 'D');
+                b->txrcol        = id;
+                b->anim          = 1;
+                b->rate          = 100;
                 b->collision_act = colact_door;
-                b->isdoor = 1;
-                r->walls[i][j] = malloc(sizeof(tt_body));
-                b = r->walls[i][j];
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->xvel = 0;
-                b->yvel = 0;
-                b->rem = 0;
-                b->txrrow = 0;
-                b->txrcol = 15;
-                b->anim = 1;
-                b->rate = 100;
+                b->isdoor        = 1;
+                r->walls[i][j]   = malloc(sizeof(tt_body));
+                b                = r->walls[i][j];
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->xvel          = 0;
+                b->yvel          = 0;
+                b->rem           = 0;
+                b->txrrow        = 0;
+                b->txrcol        = 15;
+                b->anim          = 1;
+                b->rate          = 100;
                 b->collision_act = 0;
-                b->isdoor = 0;
-                b->msg = 0;
-                b->msglen = 0;
+                b->isdoor        = 0;
+                b->msg           = 0;
+                b->msglen        = 0;
             } else if (type == '$') {
                 r->floor[i][j] = newtile(0, default_floor_id);
                 r->bodies_count++;
-                r->bodies = realloc(r->bodies,
-                                    sizeof(tt_body) * r->bodies_count);
-                tt_body *b = r->bodies + r->bodies_count - 1;
-                b->x = j * 32;
-                b->y = i * 32;
-                b->xrem = 0;
-                b->yrem = 0;
-                b->rem = 0;
-                b->txrrow = 7;
-                b->txrcol = id;
-                b->anim = 4;
-                b->rate = 100 + (rand() % 50 - 25);
+                r->bodies =
+                    realloc(r->bodies, sizeof(tt_body) * r->bodies_count);
+                tt_body *b       = r->bodies + r->bodies_count - 1;
+                b->x             = j * 32;
+                b->y             = i * 32;
+                b->xrem          = 0;
+                b->yrem          = 0;
+                b->rem           = 0;
+                b->txrrow        = 7;
+                b->txrcol        = id;
+                b->anim          = 4;
+                b->rate          = 100 + (rand() % 50 - 25);
                 b->collision_act = colact_gulag;
-                b->isdoor = 0;
+                b->isdoor        = 0;
             }
         }
         fgetc(f);
     }
     for (i = 0; i != r->bodies_count; ++i) {
-        r->bodies[i].yvel = readnum(f);
-        r->bodies[i].xvel = readnum(f);
-        r->bodies[i].msg = 0;
+        r->bodies[i].yvel   = readnum(f);
+        r->bodies[i].xvel   = readnum(f);
+        r->bodies[i].msg    = 0;
         r->bodies[i].msglen = 0;
         if (fgetc(f) == '=') {
             int c = fgetc(f);
             while (c != EOF && c != '\n') {
                 r->bodies[i].msglen++;
-                r->bodies[i].msg = realloc(r->bodies[i].msg,
-                                            r->bodies[i].msglen + 1);
+                r->bodies[i].msg =
+                    realloc(r->bodies[i].msg, r->bodies[i].msglen + 1);
                 r->bodies[i].msg[r->bodies[i].msglen - 1] = c;
-                c = fgetc(f);
+                c                                         = fgetc(f);
             }
             r->bodies[i].msg[r->bodies[i].msglen] = 0;
         }
@@ -313,9 +312,9 @@ static void loadroom(tt_room *r, FILE *f)
 void tt_map_load()
 {
     char path[] = "data/map/0";
-    char r = '0';
+    char r      = '0';
     while (r != '~') {
-        path[9] = r;
+        path[9]     = r;
         FILE *roomf = fopen(path, "r");
         if (roomf) {
             loadroom(ttmap + r, roomf);
@@ -329,8 +328,8 @@ void tt_map_load()
                     ttmap[m].walls[i][j] = 0;
                 }
             }
-            ttmap[m].bodies_count = 0;
-            ttmap[m].bodies = 0;
+            ttmap[m].bodies_count  = 0;
+            ttmap[m].bodies        = 0;
             ttmap[m].neighbours[0] = ttmap + '.';
             ttmap[m].neighbours[1] = ttmap + '.';
             ttmap[m].neighbours[2] = ttmap + '.';
@@ -340,7 +339,6 @@ void tt_map_load()
     }
 }
 
-
 void tt_map_free()
 {
     int i;