X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=roguelike.c;h=f0057e295884edbae3ad10dc1819dcd9d07d3c8d;hb=e4208c726efd55a3a5ff2be966d3fbd7d38ba9e3;hp=00b3ecc46c1f1335024b785a5f640ff23a0b5b34;hpb=acac955931dc1e68d590dbd0fe51a237da785cac;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index 00b3ecc..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,42 +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 save_game(struct World * world) {
// Save game data to game file.
FILE * file = fopen("savefile", "w");
@@ -67,10 +31,10 @@ 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.
@@ -82,8 +46,8 @@ 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->size.y;
- uint16_t width = win_meta->active->size.x;
+ uint16_t height = win_meta->active->frame.size.y;
+ uint16_t width = win_meta->active->frame.size.x;
if (change == '-')
height--;
else if (change == '+')
@@ -92,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.
@@ -248,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"))
@@ -341,14 +305,14 @@ int main (int argc, char *argv[]) {
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.size.x = 29;
- win_map.size.x = win_meta.size.x - win_keys.size.x - win_log.size.x - 2;
- win_info.size.y = 1;
- win_log.size.y = win_meta.size.y - 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);
@@ -363,7 +327,7 @@ int main (int argc, char *argv[]) {
if (start_turn == world.turn)
start_turn = 0;
if (0 == start_turn) {
- draw_all_windows (&win_meta);
+ 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")) ) {
@@ -391,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');