X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Froguelike.c;h=84290f1e5f032530608cea5904f973207a17fbd1;hb=3088d6e832b34a3cc2e73eaadcf5b8a1f2c7f258;hp=a1b7373bcc47ae1b2a27e29405a4fc1b1b27d3bc;hpb=015ca9d3e02bfe4f8a18cdec43817e2521015c00;p=plomrogue diff --git a/src/roguelike.c b/src/roguelike.c index a1b7373..84290f1 100644 --- a/src/roguelike.c +++ b/src/roguelike.c @@ -23,6 +23,18 @@ 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). +void update_log (struct World * world, char * text) { +// Update log with new text to be appended. + 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); + free(world->log); + world->log = new_text; } + struct Map init_map () { // Initialize map with some experimental start values. struct Map map; @@ -51,6 +63,25 @@ struct Map init_map () { 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++; } + +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; + for (monster = world->monster; monster != 0; monster = monster->next) + move_monster(world, monster); } + void save_game(struct World * world) { // Save game data to game file. FILE * file = fopen("savefile", "w"); @@ -66,11 +97,13 @@ void save_game(struct World * world) { write_uint16_bigendian(world->monster->next->next->pos.x, file); fclose(file); } -void record_action (char action) { -// Append action to game record file. - FILE * file = fopen("record", "a"); - fputc(action, 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. @@ -80,26 +113,6 @@ struct yx_uint16 mv_yx_in_dir (char d, struct yx_uint16 yx) { else if (d == WEST) yx.x--; return yx; } -void next_turn (struct World * world) { -// Increment turn and move enemy. - world->turn++; - rrand(1, world->seed * world->turn); - struct Monster * monster; - for (monster = world->monster; monster != 0; monster = monster->next) - move_monster(world, monster); } - -void update_log (struct World * world, char * text) { -// Update log with new text to be appended. - 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); - free(world->log); - world->log = new_text; } - 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; @@ -117,59 +130,37 @@ void move_monster (struct World * world, struct Monster * monster) { break; } } if (met_monster) update_log (world, "\nMonster hits monster."); - else if (0 == met_monster && is_passable(world->map, t.y, t.x)) + 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); } - -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; } + 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. - if (1 == world->interactive) - record_action(0); - next_turn (world); - update_log (world, "\nYou wait."); } + update_log (world, "\nYou wait."); + turn_over (world, 0); } void toggle_window (struct WinMeta * win_meta, struct Win * win) { // Toggle display of window win. @@ -200,13 +191,6 @@ void growshrink_active_window (struct WinMeta * win_meta, char change) { width++; resize_active_win (win_meta, height, width); } } -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++; } - 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.