X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Froguelike.c;h=c823482058aee71c5e7039c276f6daaf995cf56b;hb=3fca9119dd4fa5dabde64961a76422faf828cad0;hp=c8fbf5a78f1024eaa5657c5390eeb0d21fd08c3c;hpb=a1384bd171b558158855ec7c6683eba8fd8e609f;p=plomrogue
diff --git a/src/roguelike.c b/src/roguelike.c
index c8fbf5a..c823482 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -23,34 +23,67 @@ 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;
- 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 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);
+ 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 +99,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,36 +115,25 @@ struct yx_uint16 mv_yx_in_dir (char d, struct yx_uint16 yx) {
else if (d == WEST) yx.x--;
return yx; }
-char yx_uint16_cmp (struct yx_uint16 a, struct yx_uint16 b) {
-// Compare two coordinates of type yx_uint16.
- if (a.y == b.y && a.x == b.x) return 1;
- else return 0; }
-
-void next_turn (struct World * world) {
-// Increment turn and move enemy.
- world->turn++;
- rrand(1, world->seed * world->turn);
- char d;
- struct Monster * monster;
- for (monster = world->monster; monster != 0; monster = monster->next) {
- 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.");
- else if (is_passable(world->map, t.y, t.x))
- monster->pos = t; } }
-
-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;
+ 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.
@@ -147,20 +171,12 @@ void move_player (struct World * world, char d) {
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.
+ update_log (world, "\nYou wait.");
if (1 == world->interactive)
record_action(0);
- next_turn (world);
- update_log (world, "\nYou wait."); }
+ next_turn (world); }
void toggle_window (struct WinMeta * win_meta, struct Win * win) {
// Toggle display of window win.
@@ -191,17 +207,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 ('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++; }
-
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.
@@ -244,13 +249,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[]) {
@@ -323,13 +328,13 @@ int main (int argc, char *argv[]) {
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.height;
- player.pos.x = rrand(0, 0) % map.width; }
+ 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.height;
- monster->pos.x = rrand(0, 0) % map.width; } }
+ 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();