X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Froguelike.c;h=b44086aded843a3857baaf1872e7b54b67a06eb6;hb=730fe60725a42dc89918e7b9c233dd24193de8ac;hp=833b64b09f1b8ca860d9f85084ab10913651804d;hpb=1f4244b457c7df5b5981e4c0efcf93a8b6386360;p=plomrogue
diff --git a/src/roguelike.c b/src/roguelike.c
index 833b64b..b44086a 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -1,19 +1,15 @@
+#include "roguelike.h"
#include
-#include
#include
#include
#include
#include
#include "windows.h"
#include "draw_wins.h"
-#include "roguelike.h"
#include "keybindings.h"
#include "readwrite.h"
-
-#define NORTH 1
-#define EAST 2
-#define SOUTH 3
-#define WEST 4
+#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.
@@ -24,51 +20,38 @@ uint16_t rrand(char use_seed, uint32_t new_seed) {
return (seed / 65536); } // Ignore least significant 16 bits (they are less random).
void update_log (struct World * world, char * text) {
-// Update log with new text to be appended.
+// Update log by appending text, or by appending a "." if text is the same as the last one.
+ static char * last_msg;
+ if (0 == last_msg)
+ last_msg = calloc(1, sizeof(char));
char * new_text;
uint16_t len_old = strlen(world->log);
- uint16_t len_new = strlen(text);
- uint16_t len_whole = len_old + len_new + 1;
- new_text = calloc(len_whole, sizeof(char));
- memcpy(new_text, world->log, len_old);
- memcpy(new_text + len_old, text, len_new);
+ if (0 == strcmp(last_msg, text)) {
+ uint16_t len_whole = len_old + 1;
+ new_text = calloc(len_whole + 1, sizeof(char));
+ memcpy(new_text, world->log, len_old);
+ memcpy(new_text + len_old, ".", 1); }
+ else {
+ uint16_t len_new = strlen(text);
+ uint16_t len_whole = len_old + len_new + 1;
+ new_text = calloc(len_whole, sizeof(char));
+ memcpy(new_text, world->log, len_old);
+ memcpy(new_text + len_old, text, len_new);
+ last_msg = calloc(len_new + 1, sizeof(char));
+ memcpy(last_msg, text, len_new); }
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 repeats, root, curpos;
- for (root = 0; root * root * root < size; root++);
- for (repeats = 0; repeats < size * root; repeats++) {
- 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])))
- 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.
@@ -79,7 +62,7 @@ void turn_over (struct World * world, char action) {
world->turn++;
rrand(1, world->seed * world->turn);
struct Monster * monster;
- for (monster = world->monster; monster != 0; monster = monster->next)
+ for (monster = world->monster; monster != 0; monster = monster->cmo.next)
move_monster(world, monster); }
void save_game(struct World * world) {
@@ -87,78 +70,12 @@ void save_game(struct World * world) {
FILE * file = fopen("savefile", "w");
write_uint32_bigendian(world->seed, file);
write_uint32_bigendian(world->turn, file);
- write_uint16_bigendian(world->player->pos.y, file);
- write_uint16_bigendian(world->player->pos.x, file);
- write_uint16_bigendian(world->monster->pos.y, file);
- write_uint16_bigendian(world->monster->pos.x, file);
- write_uint16_bigendian(world->monster->next->pos.y, file);
- write_uint16_bigendian(world->monster->next->pos.x, file);
- write_uint16_bigendian(world->monster->next->next->pos.y, file);
- write_uint16_bigendian(world->monster->next->next->pos.x, file);
+ write_uint16_bigendian(world->player->pos.y + 1, file);
+ write_uint16_bigendian(world->player->pos.x + 1, file);
+ write_map_objects (world->monster, file, write_map_objects_monsterdata);
+ write_map_objects (world->item, file, readwrite_map_objects_dummy);
fclose(file); }
-char is_passable (struct Map * map, uint16_t y, uint16_t x) {
-// Check if coordinate on (or beyond) map is accessible to movement.
- char passable = 0;
- if (0 <= x && x < map->size.x && 0 <= y && y < map->size.y)
- if ('.' == map->cells[y * map->size.x + x])
- passable = 1;
- return passable; }
-
-struct yx_uint16 mv_yx_in_dir (char d, struct yx_uint16 yx) {
-// Return yx coordinates one step to the direction d of yx.
- if (d == NORTH) yx.y--;
- else if (d == EAST) yx.x++;
- else if (d == SOUTH) yx.y++;
- else if (d == WEST) yx.x--;
- return yx; }
-
-void move_monster (struct World * world, struct Monster * monster) {
-// Move monster in random direction, trigger fighting when hindered by player/monster.
- char d = rrand(0, 0) % 5;
- struct yx_uint16 t = mv_yx_in_dir (d, monster->pos);
- if (yx_uint16_cmp (t, world->player->pos)) {
- update_log (world, "\nThe monster hits you.");
- return; }
- struct Monster * other_monster;
- for (other_monster = world->monster; other_monster != 0; other_monster = other_monster->next) {
- if (other_monster == monster)
- continue;
- if (yx_uint16_cmp (t, other_monster->pos)) {
- update_log (world, "\nMonster hits monster.");
- return; } }
- if (is_passable(world->map, t.y, t.x))
- monster->pos = t; }
-
-void move_player (struct World * world, char d) {
-// Move player in direction d, increment turn counter and update log.
- struct yx_uint16 t = mv_yx_in_dir (d, world->player->pos);
- struct Monster * monster;
- for (monster = world->monster; monster != 0; monster = monster->next)
- if (yx_uint16_cmp (t, monster->pos)) {
- update_log (world, "\nYou hit the monster.");
- turn_over (world, d);
- return; }
- char * msg = calloc(25, sizeof(char));
- char * msg_content = "You fail to move";
- char * dir;
- if (NORTH == d) dir = "north";
- else if (EAST == d) dir = "east" ;
- else if (SOUTH == d) dir = "south";
- else if (WEST == d) dir = "west" ;
- if (is_passable(world->map, t.y, t.x)) {
- msg_content = "You move";
- world->player->pos = t; }
- sprintf(msg, "\n%s %s.", msg_content, dir);
- update_log (world, msg);
- free(msg);
- turn_over (world, d); }
-
-void player_wait (struct World * world) {
-// Make player wait one turn.
- update_log (world, "\nYou wait.");
- turn_over (world, 0); }
-
void toggle_window (struct WinMeta * win_meta, struct Win * win) {
// Toggle display of window win.
if (0 != win->frame.curses_win)
@@ -176,17 +93,12 @@ void scroll_pad (struct WinMeta * win_meta, char dir) {
void growshrink_active_window (struct WinMeta * win_meta, char change) {
// Grow or shrink active window horizontally or vertically by one cell size.
if (0 != win_meta->active) {
- uint16_t height = win_meta->active->frame.size.y;
- uint16_t width = win_meta->active->frame.size.x;
- if (change == '-')
- height--;
- else if (change == '+')
- height++;
- else if (change == '_')
- width--;
- else if (change == '*')
- width++;
- resize_active_win (win_meta, height, width); } }
+ struct yx_uint16 size = win_meta->active->frame.size;
+ if (change == '-') size.y--;
+ else if (change == '+') size.y++;
+ else if (change == '_') size.x--;
+ else if (change == '*') size.x++;
+ resize_active_win (win_meta, size); } }
unsigned char meta_keys(int key, struct World * world, struct WinMeta * win_meta, struct Win * win_keys,
struct Win * win_map, struct Win * win_info, struct Win * win_log) {
@@ -230,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[]) {
@@ -257,21 +171,14 @@ int main (int argc, char *argv[]) {
default:
exit(EXIT_FAILURE); } }
- // Initialize log, player and monsters.
+ // Initialize log, player, monsters and items.
world.log = calloc(1, sizeof(char));
update_log (&world, " ");
struct Player player;
+ player.hitpoints = 5;
world.player = &player;
- struct Monster monster1;
- struct Monster monster2;
- struct Monster monster3;
- world.monster = &monster1;
- monster1.next = &monster2;
- monster2.next = &monster3;
- monster3.next = 0;
- monster1.name = 'A';
- monster2.name = 'B';
- monster3.name = 'C';
+ world.monster = 0;
+ world.item = 0;
// For interactive mode, try to load world state from savefile.
FILE * file;
@@ -279,17 +186,13 @@ int main (int argc, char *argv[]) {
file = fopen("savefile", "r");
world.seed = read_uint32_bigendian(file);
world.turn = read_uint32_bigendian(file);
- player.pos.y = read_uint16_bigendian(file);
- player.pos.x = read_uint16_bigendian(file);
- monster1.pos.y = read_uint16_bigendian(file);
- monster1.pos.x = read_uint16_bigendian(file);
- monster2.pos.y = read_uint16_bigendian(file);
- monster2.pos.x = read_uint16_bigendian(file);
- monster3.pos.y = read_uint16_bigendian(file);
- monster3.pos.x = read_uint16_bigendian(file);
+ player.pos.y = read_uint16_bigendian(file) - 1;
+ player.pos.x = read_uint16_bigendian(file) - 1;
+ 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); }
- // For non-interactive mode, try to load world state from frecord file.
+ // For non-interactive mode, try to load world state from record file.
else {
world.turn = 1;
if (0 == world.interactive) {
@@ -308,14 +211,11 @@ int main (int argc, char *argv[]) {
struct Map map = init_map();
world.map = ↦
if (1 == world.turn) {
- for (player.pos.y = player.pos.x = 0; 0 == is_passable(&map, player.pos.y, player.pos.x);) {
- player.pos.y = rrand(0, 0) % map.size.y;
- player.pos.x = rrand(0, 0) % map.size.x; }
- struct Monster * monster;
- for (monster = world.monster; monster != 0; monster = monster->next)
- for (monster->pos.y = monster->pos.x = 0; 0 == is_passable(&map, monster->pos.y, monster->pos.x);) {
- monster->pos.y = rrand(0, 0) % map.size.y;
- monster->pos.x = rrand(0, 0) % map.size.x; } }
+ player.pos = find_passable_pos(&map);
+ unsigned char n_monsters = rrand(0, 0) % 16;
+ unsigned char n_items = rrand(0, 0) % 48;
+ build_map_objects (&world.monster, n_monsters, sizeof(struct Monster), build_map_objects_monsterdata, &map);
+ build_map_objects (&world.item, n_items, sizeof(struct Item), build_map_objects_itemdata, &map); }
// Initialize window system and windows.
WINDOW * screen = initscr();
@@ -331,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);
@@ -341,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)
@@ -350,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)
@@ -378,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);