X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Froguelike.c;h=0a5702f09d86d3a62bce681658f0463ac8435461;hb=bcc3d39d6871e1ef97c2f439d941ae2b9009ff98;hp=c823482058aee71c5e7039c276f6daaf995cf56b;hpb=3fca9119dd4fa5dabde64961a76422faf828cad0;p=plomrogue diff --git a/src/roguelike.c b/src/roguelike.c index c823482..0a5702f 100644 --- a/src/roguelike.c +++ b/src/roguelike.c @@ -1,3 +1,4 @@ +#include "roguelike.h" #include #include #include @@ -6,14 +7,9 @@ #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 "actors.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,14 +20,25 @@ 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; } @@ -70,14 +77,12 @@ void map_scroll (struct Map * map, char dir) { else if (WEST == dir && map->offset.x > 0) map->offset.x--; else if (EAST == dir) map->offset.x++; } -void record_action (char action) { -// Append action to game record file. - FILE * file = fopen("record", "a"); - fputc(action, file); - fclose(file); } - -void next_turn (struct World * world) { -// Increment turn and move enemy. +void turn_over (struct World * world, char action) { +// Record action in game record file, increment turn and move enemy. + if (1 == world->interactive) { + FILE * file = fopen("record", "a"); + fputc(action, file); + fclose(file); } world->turn++; rrand(1, world->seed * world->turn); struct Monster * monster; @@ -91,92 +96,15 @@ void save_game(struct World * world) { 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); - 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; } - char met_monster = 0; - 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)) { - met_monster = 1; - break; } } - if (met_monster) - update_log (world, "\nMonster hits monster."); - else 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. - static char prev = 0; - char success = 0; - char * dir; - 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)) { - success = 2; - break; } - if (2 != success && is_passable(world->map, t.y, t.x)) { - success = 1; - world->player->pos = t; } - if (success * d == prev) - update_log (world, "."); - else { - if (2 == success) - update_log (world, "\nYou hit the monster."); - else { - if (NORTH == d) dir = "north"; - else if (EAST == d) dir = "east" ; - else if (SOUTH == d) dir = "south"; - else if (WEST == d) dir = "west" ; - char * msg = calloc(25, sizeof(char)); - char * msg_content = "You fail to move"; - if (1 == success) - msg_content = "You move"; - sprintf(msg, "\n%s %s.", msg_content, dir); - update_log (world, msg); - free(msg); } } - prev = success * d; - if (1 == world->interactive) - record_action(d); - next_turn (world); } - -void player_wait (struct World * world) { -// Make player wait one turn. - update_log (world, "\nYou wait."); - if (1 == world->interactive) - record_action(0); - next_turn (world); } + for (monster = world->monster; monster != 0; monster = monster->next) { + write_uint16_bigendian(monster->pos.y, file); + write_uint16_bigendian(monster->pos.x, file); } + struct Item * item; + for (item = world->item; item != 0; item = item->next) { + write_uint16_bigendian(item->pos.y, file); + write_uint16_bigendian(item->pos.x, file); } + fclose(file); } void toggle_window (struct WinMeta * win_meta, struct Win * win) { // Toggle display of window win. @@ -195,17 +123,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) { @@ -276,21 +199,28 @@ 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; 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'; + char i; + struct Monster * monster = malloc(sizeof(struct Monster)); + world.monster = monster; + for (i = 0; i < 8; i++) { + monster->name = 'M'; + monster->next = malloc(sizeof(struct Monster)); + monster = monster->next; } + monster->name = 'M'; + monster->next = 0; + struct Item * item = malloc(sizeof(struct Item)); + world.item = item; + for (i = 0; i < 8; i++) { + item->name = '#'; + item->next = malloc(sizeof(struct Item)); + item = item->next; } + item->name = '#'; + item->next = 0; // For interactive mode, try to load world state from savefile. FILE * file; @@ -300,12 +230,12 @@ int main (int argc, char *argv[]) { 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); + for (monster = world.monster; monster != 0; monster = monster->next) { + monster->pos.y = read_uint16_bigendian(file); + monster->pos.x = read_uint16_bigendian(file); } + for (item = world.item; item != 0; item = item->next) { + item->pos.y = read_uint16_bigendian(file); + item->pos.x = read_uint16_bigendian(file); } fclose(file); } // For non-interactive mode, try to load world state from frecord file. @@ -327,12 +257,15 @@ 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);) { + for (player.pos.y = player.pos.x = 0; 0 == is_passable(&map, player.pos);) { player.pos.y = rrand(0, 0) % map.size.y; player.pos.x = rrand(0, 0) % map.size.x; } - struct Monster * monster; + for (item = world.item; item != 0; item = item->next) + for (item->pos.y = item->pos.x = 0; 0 == is_passable(&map, item->pos);) { + item->pos.y = rrand(0, 0) % map.size.y; + item->pos.x = rrand(0, 0) % map.size.x; } 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);) { + for (monster->pos.y = monster->pos.x = 0; 0 == is_passable(&map, monster->pos);) { monster->pos.y = rrand(0, 0) % map.size.y; monster->pos.x = rrand(0, 0) % map.size.x; } }