X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Froguelike.c;h=04da8a654799397ccdf031d499136ba21db36340;hb=867fe8e2358c8d71919b144f97e4ab272b8f4ebe;hp=206c0289243c1d152d56b1a53dd8e273c21f8501;hpb=ce023c819bd95ca0c42b7e759207dce1695216e2;p=plomrogue
diff --git a/src/roguelike.c b/src/roguelike.c
index 206c028..04da8a6 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -1,3 +1,4 @@
+#include "roguelike.h"
#include
#include
#include
@@ -6,9 +7,9 @@
#include
#include "windows.h"
#include "draw_wins.h"
-#include "roguelike.h"
#include "keybindings.h"
#include "readwrite.h"
+#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.
@@ -18,152 +19,92 @@ 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 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);
+ 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.width = 64;
- map.height = 64;
- map.offset_x = 0;
- map.offset_y = 0;
- uint32_t size = map.width * map.height;
+ 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.height; y++)
- for (x = 0; x < map.width; x++)
- map.cells[(y * map.width) + x] = '~';
- map.cells[size / 2 + (map.width / 2)] = '.';
+ 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.height;
- x = rrand(0, 0) % map.width;
- curpos = y * map.width + x;
+ 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.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] = '.'; }
+ ( (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++; }
+
+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");
write_uint32_bigendian(world->seed, file);
write_uint32_bigendian(world->turn, file);
- write_uint16_bigendian(world->player->y, file);
- write_uint16_bigendian(world->player->x, file);
- write_uint16_bigendian(world->monster->y, file);
- write_uint16_bigendian(world->monster->x, file);
- write_uint16_bigendian(world->monster->next->y, file);
- write_uint16_bigendian(world->monster->next->x, file);
- write_uint16_bigendian(world->monster->next->next->y, file);
- write_uint16_bigendian(world->monster->next->next->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); }
-
-void next_turn (struct World * world) {
-// Increment turn and move enemy.
- world->turn++;
- rrand(1, world->seed * world->turn);
- char d;
+ write_uint16_bigendian(world->player->pos.y, file);
+ write_uint16_bigendian(world->player->pos.x, file);
struct Monster * monster;
- uint16_t ty, tx;
for (monster = world->monster; monster != 0; monster = monster->next) {
- d = rrand(0, 0) % 5;
- ty = monster->y;
- tx = monster->x;
- if (1 == d)
- ty++;
- else if (2 == d)
- ty--;
- else if (3 == d)
- tx++;
- else if (4 == d)
- tx--;
- if (tx == world->player->x && ty == world->player->y)
- update_log(world, "\nThe monster hits you.");
- else if (is_passable(world->map, ty, tx)) {
- monster->y = ty;
- monster->x = tx; } } }
-
-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_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;
- uint16_t ty = world->player->y;
- uint16_t tx = world->player->x;
- if ('s' == d) {
- dir = "south";
- ty++; }
- if ('n' == d) {
- dir = "north";
- ty--; }
- if ('w' == d) {
- dir = "west";
- tx--; }
- if ('e' == d) {
- dir = "east";
- tx++; }
- struct Monster * monster;
- for (monster = world->monster; monster != 0; monster = monster->next)
- if (ty == monster->y && tx == monster->x) {
- success = 2;
- break; }
- if (2 != success && is_passable(world->map, ty, tx)) {
- success = 1;
- world->player->y = ty;
- world->player->x = tx; }
- if (success * d == prev)
- update_log (world, ".");
- else {
- if (2 == success)
- update_log (world, "\nYou hit the monster.");
- else {
- 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->width && 0 <= y && y < map->height)
- if ('.' == map->cells[y * map->width + x])
- passable = 1;
- return passable; }
-
-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."); }
+ 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.
@@ -182,28 +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); } }
-
-void map_scroll (struct Map * map, char dir) {
-// Scroll map into direction dir if possible by changing the offset.
- if ('n' == dir && map->offset_y > 0)
- map->offset_y--;
- else if ('s' == dir)
- map->offset_y++;
- else if ('w' == dir && map->offset_x > 0)
- map->offset_x--;
- else if ('e' == dir)
- map->offset_x++; }
+ 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) {
@@ -247,13 +172,13 @@ 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, 'n');
+ map_scroll (world->map, NORTH);
else if (key == get_action_key(world->keybindings, "map down"))
- map_scroll (world->map, 's');
+ map_scroll (world->map, SOUTH);
else if (key == get_action_key(world->keybindings, "map right"))
- map_scroll (world->map, 'e');
+ map_scroll (world->map, EAST);
else if (key == get_action_key(world->keybindings, "map left"))
- map_scroll (world->map, 'w');
+ map_scroll (world->map, WEST);
return 0; }
int main (int argc, char *argv[]) {
@@ -274,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 < 2; 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 < 2; 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;
@@ -296,14 +228,14 @@ int main (int argc, char *argv[]) {
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);
- monster1.y = read_uint16_bigendian(file);
- monster1.x = read_uint16_bigendian(file);
- monster2.y = read_uint16_bigendian(file);
- monster2.x = read_uint16_bigendian(file);
- monster3.y = read_uint16_bigendian(file);
- monster3.x = read_uint16_bigendian(file);
+ player.pos.y = read_uint16_bigendian(file);
+ player.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.
@@ -325,14 +257,17 @@ int main (int argc, char *argv[]) {
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; }
- struct Monster * monster;
+ 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; }
+ 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->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; } }
+ 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; } }
// Initialize window system and windows.
WINDOW * screen = initscr();
@@ -375,14 +310,14 @@ int main (int argc, char *argv[]) {
still_reading_file = 0; }
else if (0 == action)
player_wait (&world);
- else if ('s' == action)
- move_player(&world, 's');
- else if ('n' == action)
- move_player(&world, 'n');
- else if ('e' == action)
- move_player(&world, 'e');
- else if ('w' == action)
- move_player(&world, 'w'); }
+ else if (NORTH == action)
+ move_player(&world, NORTH);
+ else if (EAST == action)
+ move_player(&world, EAST);
+ else if (SOUTH == action)
+ move_player(&world, SOUTH);
+ else if (WEST == action)
+ move_player(&world, WEST); }
else
quit_called = meta_keys(key, &world, &win_meta, &win_keys, &win_map, &win_info, &win_log);
if (1 == quit_called)
@@ -397,14 +332,14 @@ int main (int argc, char *argv[]) {
last_turn = world.turn; }
draw_all_wins (&win_meta);
key = getch();
- if (key == get_action_key(world.keybindings, "player down"))
- move_player(&world, 's');
- else if (key == get_action_key(world.keybindings, "player up"))
- move_player(&world, 'n');
+ if (key == get_action_key(world.keybindings, "player up"))
+ move_player(&world, NORTH);
else if (key == get_action_key(world.keybindings, "player right"))
- move_player(&world, 'e');
+ move_player(&world, EAST);
+ else if (key == get_action_key(world.keybindings, "player down"))
+ move_player(&world, SOUTH);
else if (key == get_action_key(world.keybindings, "player left"))
- move_player(&world, 'w');
+ move_player(&world, WEST);
else if (key == get_action_key(world.keybindings, "wait / next turn"))
player_wait (&world);
else