X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/git-logo.png?a=blobdiff_plain;f=src%2Froguelike.c;h=0ec8194fb75d27031e6efdbf6bc90e1d1125e83c;hb=f29ca8b607b7e7cdb23ba90c491aaee2e294633d;hp=a4db13ca22db478f5c9dccda4a28012492e8164f;hpb=714bf970109b33005e0ab3e588d818460ccdc304;p=plomrogue

diff --git a/src/roguelike.c b/src/roguelike.c
index a4db13c..0ec8194 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -1,6 +1,5 @@
 #include "roguelike.h"
 #include <stdlib.h>
-#include <stdint.h>
 #include <ncurses.h>
 #include <string.h>
 #include <time.h>
@@ -10,6 +9,7 @@
 #include "keybindings.h"
 #include "readwrite.h"
 #include "objects_on_map.h"
+#include "map.h"
 
 uint16_t rrand(char use_seed, uint32_t new_seed) {
 // Pseudo-random number generator (LGC algorithm). Use instead of rand() to ensure portable predictability.
@@ -42,54 +42,16 @@ void update_log (struct World * world, char * text) {
   free(world->log);
   world->log = new_text; }
 
-struct Map init_map () {
-// Initialize map with some experimental start values.
-  struct Map map;
-  map.size.x = 64;
-  map.size.y = 64;
-  map.offset.x = 0;
-  map.offset.y = 0;
-  uint32_t size = map.size.x * map.size.y;
-  map.cells = malloc(size);
-  uint16_t y, x;
-  for (y = 0; y < map.size.y; y++)
-    for (x = 0; x < map.size.x; x++)
-      map.cells[(y * map.size.x) + x] = '~';
-  map.cells[size / 2 + (map.size.x / 2)] = '.';
-  uint32_t curpos;
-  while (1) {
-    y = rrand(0, 0) % map.size.y;
-    x = rrand(0, 0) % map.size.x;
-    curpos = y * map.size.x + x;
-    if ('~' == map.cells[curpos] &&
-        (   (curpos >= map.size.x && '.' == map.cells[curpos - map.size.x])
-         || (curpos < map.size.x * (map.size.y-1) && '.' == map.cells[curpos + map.size.x])
-         || (curpos > 0 && curpos % map.size.x != 0 && '.' == map.cells[curpos-1])
-         || (curpos < (map.size.x * map.size.y) && (curpos+1) % map.size.x != 0 && '.' == map.cells[curpos+1]))) {
-      if (y == 0 || y == map.size.y - 1 || x == 0 || x == map.size.x - 1)
-        break;
-      map.cells[y * map.size.x + x] = '.'; } }
-  return map; }
-
-void map_scroll (struct Map * map, char dir, struct yx_uint16 win_size) {
-// Scroll map into direction dir if possible by changing the offset.
-  if      (NORTH == dir && map->offset.y > 0)
-    map->offset.y--;
-  else if (WEST  == dir && map->offset.x > 0)
-    map->offset.x--;
-  else if (SOUTH == dir && map->offset.y + win_size.y < map->size.y)
-    map->offset.y++;
-  else if (EAST  == dir && map->offset.x + win_size.x < map->size.x)
-    map->offset.x++; }
-
-void map_center_player (struct Map * map, struct Player * player, struct yx_uint16 win_size) {
-// Center map on player.
-  if (player->pos.y < win_size.y / 2)                      map->offset.y = 0;
-  else if (player->pos.y < map->size.y - (win_size.y / 2)) map->offset.y = player->pos.y - (win_size.y / 2);
-  else                                                     map->offset.y = map->size.y - win_size.y;
-  if (player->pos.x < win_size.x / 2)                      map->offset.x = 0;
-  else if (player->pos.x < map->size.x - (win_size.x / 2)) map->offset.x = player->pos.x - (win_size.x / 2);
-  else                                                     map->offset.x = map->size.x - win_size.x; }
+uint16_t center_offset (uint16_t pos, uint16_t mapsize, uint16_t framesize) {
+// Return the offset for display of a map inside a frame centered on pos.
+  uint16_t offset = 0;
+  if (mapsize > framesize) {
+    if (pos > framesize / 2) {
+      if (pos < mapsize - (framesize / 2))
+        offset = pos - (framesize / 2);
+      else
+        offset = mapsize - framesize; } }
+  return offset; }
 
 void turn_over (struct World * world, char action) {
 // Record action in game record file, increment turn and move enemy.
@@ -110,6 +72,7 @@ void save_game(struct World * world) {
   write_uint32_bigendian(world->turn, file);
   write_uint16_bigendian(world->player->pos.y + 1, file);
   write_uint16_bigendian(world->player->pos.x + 1, file);
+  fputc(world->player->hitpoints, file);
   write_map_objects (world->monster, file, write_map_objects_monsterdata);
   write_map_objects (world->item, file, readwrite_map_objects_dummy);
   fclose(file); }
@@ -226,6 +189,7 @@ int main (int argc, char *argv[]) {
     world.turn = read_uint32_bigendian(file);
     player.pos.y = read_uint16_bigendian(file) - 1;
     player.pos.x = read_uint16_bigendian(file) - 1;
+    player.hitpoints = fgetc(file);
     read_map_objects (&world.monster, file, sizeof(struct Monster), read_map_objects_monsterdata);
     read_map_objects (&world.item,    file, sizeof(struct Item),    readwrite_map_objects_dummy);
     fclose(file); }