X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=f0057e295884edbae3ad10dc1819dcd9d07d3c8d;hb=bf4af82bde0a08823b001e731629391904f93281;hp=5d4207175f9031e568bb05d0bf90ac862d1fa62a;hpb=2f4691b20aaf36f0eb5bc9e4830eabcf74fabed2;p=plomrogue diff --git a/roguelike.c b/roguelike.c index 5d42071..f0057e2 100644 --- a/roguelike.c +++ b/roguelike.c @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -9,6 +8,7 @@ #include "draw_wins.h" #include "roguelike.h" #include "keybindings.h" +#include "readwrite.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. @@ -18,53 +18,6 @@ uint16_t rrand(char use_seed, uint32_t new_seed) { seed = ((seed * 1103515245) + 12345) % 2147483648; // Values as recommended by POSIX.1-2001 (see rand(3)). return (seed / 65536); } // Ignore least significant 16 bits (they are less random). -uint16_t read_uint16_bigendian(FILE * file) { -// Read uint16 from file in big-endian order. - const uint16_t nchar = UCHAR_MAX + 1; - unsigned char a = fgetc(file); - unsigned char b = fgetc(file); - return (a * nchar) + b; } - -void write_uint16_bigendian(uint16_t x, FILE * file) { -// Write uint16 to file in beg-endian order. - const uint16_t nchar = UCHAR_MAX + 1; - unsigned char a = x / nchar; - unsigned char b = x % nchar; - fputc(a, file); - fputc(b, file); } - -uint32_t read_uint32_bigendian(FILE * file) { -// Read uint32 from file in big-endian order. - const uint16_t nchar = UCHAR_MAX + 1; - unsigned char a = fgetc(file); - unsigned char b = fgetc(file); - unsigned char c = fgetc(file); - unsigned char d = fgetc(file); - return (a * nchar * nchar * nchar) + (b * nchar * nchar) + (c * nchar) + d; } - -void write_uint32_bigendian(uint32_t x, FILE * file) { -// Write uint32 to file in beg-endian order. - const uint16_t nchar = UCHAR_MAX + 1; - unsigned char a = x / (nchar * nchar * nchar); - unsigned char b = (x - (a * nchar * nchar * nchar)) / (nchar * nchar); - unsigned char c = (x - ((a * nchar * nchar * nchar) + (b * nchar * nchar))) / nchar; - unsigned char d = x % nchar; - fputc(a, file); - fputc(b, file); - fputc(c, file); - fputc(d, file); } - -void load_game(struct World * world) { -// Load game data from game file. - FILE * file = fopen("savefile", "r"); - world->seed = read_uint32_bigendian(file); - world->turn = read_uint32_bigendian(file); - world->player->y = read_uint16_bigendian(file); - world->player->x = read_uint16_bigendian(file); - world->monster->y = read_uint16_bigendian(file); - world->monster->x = read_uint16_bigendian(file); - fclose(file); } - void save_game(struct World * world) { // Save game data to game file. FILE * file = fopen("savefile", "w"); @@ -78,16 +31,23 @@ void save_game(struct World * world) { void toggle_window (struct WinMeta * win_meta, struct Win * win) { // Toggle display of window win. - if (0 != win->curses) - suspend_window(win_meta, win); + if (0 != win->frame.curses_win) + suspend_win(win_meta, win); else - append_window(win_meta, win); } + append_win(win_meta, win); } + +void scroll_pad (struct WinMeta * win_meta, char dir) { +// Try to scroll pad left or right. + if ('+' == dir) + reset_pad_offset(win_meta, win_meta->pad_offset + 1); + else if ('-' == dir) + reset_pad_offset(win_meta, win_meta->pad_offset - 1); } 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->height; - uint16_t width = win_meta->active->width; + uint16_t height = win_meta->active->frame.size.y; + uint16_t width = win_meta->active->frame.size.x; if (change == '-') height--; else if (change == '+') @@ -96,7 +56,7 @@ void growshrink_active_window (struct WinMeta * win_meta, char change) { width--; else if (change == '*') width++; - resize_active_window (win_meta, height, width); } } + resize_active_win (win_meta, height, width); } } struct Map init_map () { // Initialize map with some experimental start values. @@ -105,19 +65,25 @@ struct Map init_map () { map.height = 64; map.offset_x = 0; map.offset_y = 0; - map.cells = malloc(map.width * map.height); - uint16_t x, y, ran; - char terrain; + uint32_t size = map.width * map.height; + map.cells = malloc(size); + uint16_t y, x; for (y = 0; y < map.height; y++) - for (x = 0; x < map.width; x++) { - terrain = '.'; - ran = rrand(0, 0); - if ( 0 == ran % ((x*x) / 3 + 1) - || 0 == ran % ((y*y) / 3 + 1) - || 0 == ran % ((map.width - x - 1) * (map.width - x - 1) / 3 + 1) - || 0 == ran %((map.height - y - 1) * (map.height - y - 1) / 3 + 1)) - terrain = ' '; - map.cells[(y * map.width) + x] = terrain; } + for (x = 0; x < map.width; x++) + map.cells[(y * map.width) + x] = '~'; + map.cells[size / 2 + (map.width / 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.height; + x = rrand(0, 0) % map.width; + curpos = y * map.width + x; + if ('~' == map.cells[curpos] && + ( (curpos >= map.width && '.' == map.cells[curpos - map.width]) + || (curpos < map.width * (map.height-1) && '.' == map.cells[curpos + map.width]) + || (curpos > 0 && curpos % map.width != 0 && '.' == map.cells[curpos-1]) + || (curpos < (map.width * map.height) && (curpos+1) % map.width != 0 && '.' == map.cells[curpos+1]))) + map.cells[y * map.width + x] = '.'; } return map; } void map_scroll (struct Map * map, char dir) { @@ -148,7 +114,7 @@ void next_turn (struct World * world) { tx--; if (tx == world->player->x && ty == world->player->y) update_log(world, "\nThe monster hits you."); - else if (is_passable(world, tx, ty)) { + else if (is_passable(world->map, ty, tx)) { world->monster->y = ty; world->monster->x = tx; } } @@ -164,11 +130,11 @@ void update_log (struct World * world, char * text) { free(world->log); world->log = new_text; } -char is_passable (struct World * world, uint16_t x, uint16_t y) { +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 < world->map->width && 0 <= y && y < world->map->height) - if ('.' == world->map->cells[y * world->map->width + x]) + if (0 <= x && x < map->width && 0 <= y && y < map->height) + if ('.' == map->cells[y * map->width + x]) passable = 1; return passable; } @@ -199,7 +165,7 @@ void move_player (struct World * world, char d) { tx++; } if (ty == world->monster->y && tx == world->monster->x) success = 2; - else if (is_passable(world, tx, ty)) { + else if (is_passable(world->map, ty, tx)) { success = 1; world->player->y = ty; world->player->x = tx; } @@ -228,14 +194,6 @@ void player_wait (struct World * world) { next_turn (world); update_log (world, "\nYou wait."); } -void startpos(struct World * world) { -// Initialize some default starting values. - world->turn = 1; - world->player->y = 8; - world->player->x = 8; - world->monster->y = 55; - world->monster->x = 55; } - 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) { // Call some meta program / window management actions dependent on key. Return 1 to signal quitting. @@ -254,13 +212,13 @@ unsigned char meta_keys(int key, struct World * world, struct WinMeta * win_meta else if (key == get_action_key(world->keybindings, "toggle log window")) toggle_window(win_meta, win_log); else if (key == get_action_key(world->keybindings, "cycle forwards")) - cycle_active_window(win_meta, 'n'); + cycle_active_win(win_meta, 'n'); else if (key == get_action_key(world->keybindings, "cycle backwards")) - cycle_active_window(win_meta, 'p'); + cycle_active_win(win_meta, 'p'); else if (key == get_action_key(world->keybindings, "shift forwards")) - shift_active_window(win_meta, 'f'); + shift_active_win(win_meta, 'f'); else if (key == get_action_key(world->keybindings, "shift backwards")) - shift_active_window(win_meta, 'b'); + shift_active_win(win_meta, 'b'); else if (key == get_action_key(world->keybindings, "grow horizontally")) growshrink_active_window(win_meta, '*'); else if (key == get_action_key(world->keybindings, "shrink horizontally")) @@ -291,15 +249,18 @@ int main (int argc, char *argv[]) { struct World world; world.interactive = 1; int opt; - while ((opt = getopt(argc, argv, "s")) != -1) { + uint32_t start_turn; + while ((opt = getopt(argc, argv, "s::")) != -1) { switch (opt) { case 's': world.interactive = 0; + start_turn = 0; + if (optarg) + start_turn = atoi(optarg); break; default: exit(EXIT_FAILURE); } } - init_keybindings(&world); world.log = calloc(1, sizeof(char)); update_log (&world, " "); struct Player player; @@ -307,55 +268,73 @@ int main (int argc, char *argv[]) { struct Monster monster; world.monster = &monster; FILE * file; - - if (0 == world.interactive) { - startpos(&world); - file = fopen("record", "r"); - world.seed = read_uint32_bigendian(file); } + if (1 == world.interactive && 0 == access("savefile", F_OK)) { + file = fopen("savefile", "r"); + world.seed = read_uint32_bigendian(file); + world.turn = read_uint32_bigendian(file); + player.y = read_uint16_bigendian(file); + player.x = read_uint16_bigendian(file); + monster.y = read_uint16_bigendian(file); + monster.x = read_uint16_bigendian(file); + fclose(file); } else { - if (0 == access("savefile", F_OK)) - load_game(&world); + world.turn = 1; + if (0 == world.interactive) { + file = fopen("record", "r"); + world.seed = read_uint32_bigendian(file); } else { - startpos(&world); - world.seed = time(NULL); file = fopen("record", "w"); + world.seed = time(NULL); write_uint32_bigendian(world.seed, file); fclose(file); } } rrand(1, world.seed); struct Map map = init_map(); world.map = ↦ + if (1 == world.turn) { + for (player.y = player.x = 0; 0 == is_passable(&map, player.y, player.x);) { + player.y = rrand(0, 0) % map.height; + player.x = rrand(0, 0) % map.width; } + for (monster.y = monster.x = 0; 0 == is_passable(&map, monster.y, monster.x);) { + monster.y = rrand(0, 0) % map.height; + monster.x = rrand(0, 0) % map.width; } } WINDOW * screen = initscr(); noecho(); curs_set(0); keypad(screen, TRUE); raw(); + init_keybindings(&world); struct WinMeta win_meta = init_win_meta(screen); - struct Win win_keys = init_window(&win_meta, "Keys", &world, draw_keys_win); - struct Win win_map = init_window(&win_meta, "Map", &world, draw_map_win); - struct Win win_info = init_window(&win_meta, "Info", &world, draw_info_win); - struct Win win_log = init_window(&win_meta, "Log", &world, draw_log_win); - win_keys.width = 29; - win_map.width = win_meta.width - win_keys.width - win_log.width - 2; - win_info.height = 1; - win_log.height = win_meta.height - 3; + struct Win win_keys = init_win(&win_meta, "Keys", &world, draw_keys_win); + struct Win win_map = init_win(&win_meta, "Map", &world, draw_map_win); + struct Win win_info = init_win(&win_meta, "Info", &world, draw_info_win); + 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; toggle_window(&win_meta, &win_keys); toggle_window(&win_meta, &win_map); toggle_window(&win_meta, &win_info); toggle_window(&win_meta, &win_log); int key; - unsigned char quit_called; + unsigned char quit_called = 0; if (0 == world.interactive) { unsigned char still_reading_file = 1; int action; while (1) { - draw_all_windows (&win_meta); - key = getch(); - if (1 == still_reading_file && key == get_action_key(world.keybindings, "wait / next turn") ) { + if (start_turn == world.turn) + start_turn = 0; + if (0 == start_turn) { + draw_all_wins (&win_meta); + key = getch(); } + if (1 == still_reading_file && + (world.turn < start_turn || key == get_action_key(world.keybindings, "wait / next turn")) ) { action = getc(file); - if (EOF == action) - still_reading_file = 0; + if (EOF == action) { + start_turn = 0; + still_reading_file = 0; } else if (0 == action) player_wait (&world); else if ('s' == action) @@ -376,7 +355,7 @@ int main (int argc, char *argv[]) { if (last_turn != world.turn) { save_game(&world); last_turn = world.turn; } - draw_all_windows (&win_meta); + draw_all_wins (&win_meta); key = getch(); if (key == get_action_key(world.keybindings, "player down")) move_player(&world, 's');