From b452c5e230013cbb209f877f99681f6f417cda74 Mon Sep 17 00:00:00 2001 From: DTB Date: Sat, 25 Nov 2023 10:53:26 -0700 Subject: [PATCH] remove coin_toss() --- rogue/Makefile | 4 ++-- rogue/level.c | 7 ++++--- rogue/main.c | 14 ++++++++------ rogue/monster.c | 6 ++++-- rogue/move.c | 5 +++-- rogue/object.c | 8 ++++---- rogue/rogue.h | 1 - 7 files changed, 25 insertions(+), 20 deletions(-) diff --git a/rogue/Makefile b/rogue/Makefile index 8f26101..1279498 100644 --- a/rogue/Makefile +++ b/rogue/Makefile @@ -1,6 +1,6 @@ OBJ = hit.o init.o inventory.o level.o machdep.o main.o message.o monster.o \ - move.o object.o pack.o play.o random.o ring.o room.o save.o score.o \ - spec_hit.o throw.o trap.o use.o zap.o + move.o object.o pack.o play.o ring.o room.o save.o score.o spec_hit.o \ + throw.o trap.o use.o zap.o rogue: $(OBJ) $(CC) $(CFLAGS) -lcurses -o $@ $(OBJ) diff --git a/rogue/level.c b/rogue/level.c index 63af842..8353870 100644 --- a/rogue/level.c +++ b/rogue/level.c @@ -44,6 +44,8 @@ * */ +#include /* rand(3) */ + #include "random.h" #include "rogue.h" @@ -514,7 +516,7 @@ fill_out_level(void) for (i = 0; i < MAXROOMS; i++) { rn = random_rooms[i]; if ((rooms[rn].is_room & R_NOTHING) || - ((rooms[rn].is_room & R_CROSS) && coin_toss())) { + ((rooms[rn].is_room & R_CROSS) && (rand() & 1))) { fill_it(rn, 1); } } @@ -572,9 +574,8 @@ fill_it(int rn, boolean do_rec_de) if ((i < 3) && (!did_this)) { did_this = 1; - if (coin_toss()) { + if(rand() & 1) continue; - } } if ((rooms_found < 2) && do_rec_de) { recursive_deadend(rn, offsets, srow, scol); diff --git a/rogue/main.c b/rogue/main.c index ae5033a..a07cf98 100644 --- a/rogue/main.c +++ b/rogue/main.c @@ -44,14 +44,17 @@ * */ +#include /* srand(3) */ +#include /* time(3) */ #include "rogue.h" int -main(int argc, char *argv[]) -{ - if (init(argc, argv)) { /* restored game */ +main(int argc, char *argv[]){ + + srand(time(NULL)); + + if(init(argc, argv)) /* restored game */ goto PL; - } for (;;) { clear_level(); @@ -62,8 +65,7 @@ main(int argc, char *argv[]) put_mons(); put_player(party_room); print_stats(STAT_ALL); -PL: - play_level(); +PL: play_level(); free_stuff(&level_objects); free_stuff(&level_monsters); } diff --git a/rogue/monster.c b/rogue/monster.c index 8499ae7..f8a6fe4 100644 --- a/rogue/monster.c +++ b/rogue/monster.c @@ -44,6 +44,8 @@ * */ +#include /* rand(3) */ + #include "random.h" #include "rogue.h" @@ -134,7 +136,7 @@ put_mons(void) for (i = 0; i < n; i++) { monster = gr_monster(NULL, 0); - if ((monster->m_flags & WANDERS) && coin_toss()) { + if ((monster->m_flags & WANDERS) && (rand() & 1)) { wake_up(monster); } gr_row_col(&row, &col, (FLOOR | TUNNEL | STAIRS | OBJECT)); @@ -750,7 +752,7 @@ move_confused(object *monster) monster->m_flags &= (~CONFUSED); } if (monster->m_flags & STATIONARY) { - return(coin_toss() ? 1 : 0); + return rand() & 1; } else if (rand_percent(15)) { return(1); } diff --git a/rogue/move.c b/rogue/move.c index c04bee8..4f173a8 100644 --- a/rogue/move.c +++ b/rogue/move.c @@ -44,6 +44,8 @@ * */ +#include /* rand(3) */ + #include "random.h" #include "rogue.h" @@ -393,9 +395,8 @@ check_hunger(boolean msg_only) } messagef(1, "you faint"); for (i = 0; i < n; i++) { - if (coin_toss()) { + if(rand() & 1) mv_mons(); - } } messagef(1, "%s", you_can_move_again); } diff --git a/rogue/object.c b/rogue/object.c index 85fedb6..37a44f6 100644 --- a/rogue/object.c +++ b/rogue/object.c @@ -44,6 +44,7 @@ * */ +#include /* rand(3) */ #include "random.h" #include "rogue.h" @@ -174,7 +175,7 @@ put_objects(void) if (cur_level < max_level) { return; } - n = coin_toss() ? get_rand(2, 4) : get_rand(3, 5); + n = get_rand(2, 4) + (rand() & 1); while (rand_percent(33)) { n++; } @@ -517,11 +518,10 @@ gr_weapon(object *obj, int assign_wk) obj->is_cursed = 1; } for (i = 0; i < blessing; i++) { - if (coin_toss()) { + if(rand() & 1) obj->hit_enchant += increment; - } else { + else obj->d_enchant += increment; - } } } switch(obj->which_kind) { diff --git a/rogue/rogue.h b/rogue/rogue.h index facb3cb..52e7666 100644 --- a/rogue/rogue.h +++ b/rogue/rogue.h @@ -474,7 +474,6 @@ int check_up(void); void clean_up(const char *) __dead; void clear_level(void); void cnfs(void); -int coin_toss(void); void cough_up(object *); void create_monster(void); void darken_room(short);