home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restructured main() start. Start with empty log.
[plomrogue]
/
roguelike.c
diff --git
a/roguelike.c
b/roguelike.c
index c68e983705466eac6a3f920127070b3ca51486bb..0521ae953e818299c41bf6b461649cfbd347d527 100644
(file)
--- a/
roguelike.c
+++ b/
roguelike.c
@@
-54,8
+54,8
@@
void write_uint32_bigendian(uint32_t x, FILE * file) {
fputc(c, file);
fputc(d, file); }
fputc(c, file);
fputc(d, file); }
-void load_
seed
(struct World * world) {
-// Load
seed integer from seed
file.
+void load_
game
(struct World * world) {
+// Load
game data from game
file.
FILE * file = fopen("savefile", "r");
world->seed = read_uint32_bigendian(file);
world->turn = read_uint32_bigendian(file);
FILE * file = fopen("savefile", "r");
world->seed = read_uint32_bigendian(file);
world->turn = read_uint32_bigendian(file);
@@
-65,8
+65,8
@@
void load_seed(struct World * world) {
world->monster->x = read_uint16_bigendian(file);
fclose(file); }
world->monster->x = read_uint16_bigendian(file);
fclose(file); }
-void save_
seed
(struct World * world) {
-// Save
seed integer to seed
file.
+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);
FILE * file = fopen("savefile", "w");
write_uint32_bigendian(world->seed, file);
write_uint32_bigendian(world->turn, file);
@@
-220,12
+220,16
@@
void player_wait (struct World * world) {
int main (int argc, char *argv[]) {
struct World world;
int main (int argc, char *argv[]) {
struct World world;
+ init_keybindings(&world);
+
+ world.log = calloc(1, sizeof(char));
+ update_log (&world, " ");
struct Player player;
world.player = &player;
struct Monster monster;
world.monster = &monster;
if (0 == access("savefile", F_OK))
struct Player player;
world.player = &player;
struct Monster monster;
world.monster = &monster;
if (0 == access("savefile", F_OK))
- load_
seed
(&world);
+ load_
game
(&world);
else {
player.y = 8;
player.x = 8;
else {
player.y = 8;
player.x = 8;
@@
-234,10
+238,6
@@
int main (int argc, char *argv[]) {
world.seed = time(NULL);
world.turn = 1; }
rrand(1, world.seed);
world.seed = time(NULL);
world.turn = 1; }
rrand(1, world.seed);
-
- init_keybindings(&world);
- world.log = calloc(1, sizeof(char));
- update_log (&world, "Start!");
struct Map map = init_map();
world.map = ↦
struct Map map = init_map();
world.map = ↦
@@
-256,7
+256,7
@@
int main (int argc, char *argv[]) {
uint32_t last_turn = 0;
while (1) {
if (last_turn != world.turn) {
uint32_t last_turn = 0;
while (1) {
if (last_turn != world.turn) {
- save_
seed
(&world);
+ save_
game
(&world);
last_turn = world.turn; }
draw_all_windows (&win_meta);
key = getch();
last_turn = world.turn; }
draw_all_windows (&win_meta);
key = getch();