X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Froguelike.c;h=b44086aded843a3857baaf1872e7b54b67a06eb6;hb=730fe60725a42dc89918e7b9c233dd24193de8ac;hp=162740d696836317214df2a1d4b1f3b1001064b3;hpb=0e8033daabeddfea46bbb756280292df84cd61af;p=plomrogue
diff --git a/src/roguelike.c b/src/roguelike.c
index 162740d..b44086a 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -1,6 +1,5 @@
#include "roguelike.h"
#include
-#include
#include
#include
#include
@@ -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,41 +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) {
-// Scroll map into direction dir if possible by changing the offset.
- if (NORTH == dir && map->offset.y > 0) map->offset.y--;
- else if (SOUTH == dir) map->offset.y++;
- else if (WEST == dir && map->offset.x > 0) map->offset.x--;
- else if (EAST == dir) map->offset.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.
@@ -167,13 +142,15 @@ unsigned char meta_keys(int key, struct World * world, struct WinMeta * win_meta
else if (key == get_action_key(world->keybindings, "keys mod"))
keyswin_mod_key (world, win_meta);
else if (key == get_action_key(world->keybindings, "map up"))
- map_scroll (world->map, NORTH);
+ map_scroll (world->map, NORTH, win_map->frame.size);
else if (key == get_action_key(world->keybindings, "map down"))
- map_scroll (world->map, SOUTH);
+ map_scroll (world->map, SOUTH, win_map->frame.size);
else if (key == get_action_key(world->keybindings, "map right"))
- map_scroll (world->map, EAST);
+ map_scroll (world->map, EAST, win_map->frame.size);
else if (key == get_action_key(world->keybindings, "map left"))
- map_scroll (world->map, WEST);
+ map_scroll (world->map, WEST, win_map->frame.size);
+ else if (key == get_action_key(world->keybindings, "map center player"))
+ map_center_player (world->map, world->player, win_map->frame.size);
return 0; }
int main (int argc, char *argv[]) {
@@ -198,6 +175,7 @@ int main (int argc, char *argv[]) {
world.log = calloc(1, sizeof(char));
update_log (&world, " ");
struct Player player;
+ player.hitpoints = 5;
world.player = &player;
world.monster = 0;
world.item = 0;
@@ -253,8 +231,8 @@ int main (int argc, char *argv[]) {
struct Win win_log = init_win(&win_meta, "Log", &world, draw_log_win);
win_keys.frame.size.x = 29;
win_map.frame.size.x = win_meta.pad.size.x - win_keys.frame.size.x - win_log.frame.size.x - 2;
- win_info.frame.size.y = 1;
- win_log.frame.size.y = win_meta.pad.size.y - 3;
+ win_info.frame.size.y = 2;
+ win_log.frame.size.y = win_meta.pad.size.y - (2 + win_info.frame.size.y);
toggle_window(&win_meta, &win_keys);
toggle_window(&win_meta, &win_map);
toggle_window(&win_meta, &win_info);
@@ -263,8 +241,8 @@ int main (int argc, char *argv[]) {
// Replay mode.
int key;
unsigned char quit_called = 0;
+ unsigned char await_actions = 1;
if (0 == world.interactive) {
- unsigned char still_reading_file = 1;
int action;
while (1) {
if (start_turn == world.turn)
@@ -272,12 +250,12 @@ int main (int argc, char *argv[]) {
if (0 == start_turn) {
draw_all_wins (&win_meta);
key = getch(); }
- if (1 == still_reading_file &&
+ if (1 == await_actions &&
(world.turn < start_turn || key == get_action_key(world.keybindings, "wait / next turn")) ) {
action = getc(file);
if (EOF == action) {
start_turn = 0;
- still_reading_file = 0; }
+ await_actions = 0; }
else if (0 == action)
player_wait (&world);
else if (NORTH == action)
@@ -300,17 +278,19 @@ int main (int argc, char *argv[]) {
if (last_turn != world.turn) {
save_game(&world);
last_turn = world.turn; }
+ if (1 == await_actions && 0 == player.hitpoints)
+ await_actions = 0;
draw_all_wins (&win_meta);
key = getch();
- if (key == get_action_key(world.keybindings, "player up"))
+ if (1 == await_actions && key == get_action_key(world.keybindings, "player up"))
move_player(&world, NORTH);
- else if (key == get_action_key(world.keybindings, "player right"))
+ else if (1 == await_actions && key == get_action_key(world.keybindings, "player right"))
move_player(&world, EAST);
- else if (key == get_action_key(world.keybindings, "player down"))
+ else if (1 == await_actions && key == get_action_key(world.keybindings, "player down"))
move_player(&world, SOUTH);
- else if (key == get_action_key(world.keybindings, "player left"))
+ else if (1 == await_actions && key == get_action_key(world.keybindings, "player left"))
move_player(&world, WEST);
- else if (key == get_action_key(world.keybindings, "wait / next turn"))
+ else if (1 == await_actions && key == get_action_key(world.keybindings, "wait / next turn"))
player_wait (&world);
else
quit_called = meta_keys(key, &world, &win_meta, &win_keys, &win_map, &win_info, &win_log);