forked from NotAShelf/rogged
various: consolidate game state into a GameState struct
Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: I9d8998707c02e64cf177a6eeb51e399e6a6a6964
This commit is contained in:
parent
d3798cc99f
commit
786fce3814
GPG key ID:
29D95B64378DB4BF
13 changed files with 105 additions and 102 deletions
12
src/combat.c
12
src/combat.c
|
|
@ -11,11 +11,17 @@ typedef struct {
|
|||
|
||||
static CombatEvent last_event = {NULL, 0, 0};
|
||||
|
||||
const char *combat_get_last_message(void) { return last_event.message; }
|
||||
const char *combat_get_last_message(void) {
|
||||
return last_event.message;
|
||||
}
|
||||
|
||||
int combat_get_last_damage(void) { return last_event.damage; }
|
||||
int combat_get_last_damage(void) {
|
||||
return last_event.damage;
|
||||
}
|
||||
|
||||
int combat_was_player_damage(void) { return last_event.is_player_damage; }
|
||||
int combat_was_player_damage(void) {
|
||||
return last_event.is_player_damage;
|
||||
}
|
||||
|
||||
void combat_player_attack(Player *p, Enemy *e) {
|
||||
if (e == NULL || !e->alive)
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@ void enemy_spawn(Enemy enemies[], int *count, Map *map, Player *p, int floor);
|
|||
void enemy_update_all(Enemy enemies[], int count, Player *p, Map *map);
|
||||
|
||||
// Check if position has an enemy
|
||||
int is_enemy_at(Enemy *enemies, int count, int x, int y);
|
||||
int is_enemy_at(const Enemy *enemies, int count, int x, int y);
|
||||
|
||||
#endif // ENEMY_H
|
||||
|
|
|
|||
152
src/main.c
152
src/main.c
|
|
@ -10,57 +10,42 @@
|
|||
#include "rng.h"
|
||||
#include "settings.h"
|
||||
#include <stddef.h>
|
||||
|
||||
// Global game state
|
||||
static Player player;
|
||||
static Map map;
|
||||
static Dungeon dungeon;
|
||||
static Enemy enemies[MAX_ENEMIES];
|
||||
static int enemy_count;
|
||||
static Item items[MAX_ITEMS];
|
||||
static int item_count;
|
||||
static int game_over = 0;
|
||||
static int game_won = 0;
|
||||
static const char *last_message = NULL;
|
||||
static int message_timer = 0;
|
||||
|
||||
// Turn counter for enemy movement (enemies move every other turn)
|
||||
static int turn_count = 0;
|
||||
#include <string.h>
|
||||
|
||||
// Initialize a new floor
|
||||
static void init_floor(int floor_num) {
|
||||
static void init_floor(GameState *gs, int floor_num) {
|
||||
// Generate dungeon
|
||||
dungeon_generate(&dungeon, &map, floor_num);
|
||||
dungeon_generate(&gs->dungeon, &gs->map, floor_num);
|
||||
|
||||
// Seed rng for this floor's content
|
||||
rng_seed(floor_num * 54321);
|
||||
|
||||
// Find spawn position
|
||||
int start_x, start_y;
|
||||
get_random_floor_tile(&map, &start_x, &start_y, 100);
|
||||
get_random_floor_tile(&gs->map, &start_x, &start_y, 100);
|
||||
|
||||
// Initialize player position if first floor
|
||||
if (floor_num == 1) {
|
||||
player_init(&player, start_x, start_y);
|
||||
player_init(&gs->player, start_x, start_y);
|
||||
} else {
|
||||
// Move player to new floor position
|
||||
player.x = start_x;
|
||||
player.y = start_y;
|
||||
gs->player.x = start_x;
|
||||
gs->player.y = start_y;
|
||||
}
|
||||
player.floor = floor_num;
|
||||
gs->player.floor = floor_num;
|
||||
|
||||
// Spawn enemies
|
||||
enemy_spawn(enemies, &enemy_count, &map, &player, floor_num);
|
||||
enemy_spawn(gs->enemies, &gs->enemy_count, &gs->map, &gs->player, floor_num);
|
||||
|
||||
// Spawn items
|
||||
item_spawn(items, &item_count, &map, floor_num);
|
||||
item_spawn(gs->items, &gs->item_count, &gs->map, floor_num);
|
||||
|
||||
// Reset turn counter
|
||||
turn_count = 0;
|
||||
gs->turn_count = 0;
|
||||
}
|
||||
|
||||
// Handle player input - returns: 0=continue, -1=quit
|
||||
static int handle_input(void) {
|
||||
// Handle player input - returns: 0=continue, 1=acted, -1=quit
|
||||
static int handle_input(GameState *gs) {
|
||||
int dx = 0, dy = 0;
|
||||
|
||||
// Check for quit first (always works)
|
||||
|
|
@ -69,19 +54,18 @@ static int handle_input(void) {
|
|||
}
|
||||
|
||||
// Check for restart (works during game over)
|
||||
if (IsKeyPressed(KEY_R) && game_over) {
|
||||
game_over = 0;
|
||||
game_won = 0;
|
||||
init_floor(1);
|
||||
if (IsKeyPressed(KEY_R) && gs->game_over) {
|
||||
memset(gs, 0, sizeof(GameState));
|
||||
init_floor(gs, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Check for item usage (U key)
|
||||
if (IsKeyPressed(KEY_U) && !game_over) {
|
||||
if (player.inventory_count > 0) {
|
||||
if (player_use_first_item(&player)) {
|
||||
last_message = "Used item!";
|
||||
message_timer = 60;
|
||||
if (IsKeyPressed(KEY_U) && !gs->game_over) {
|
||||
if (gs->player.inventory_count > 0) {
|
||||
if (player_use_first_item(&gs->player)) {
|
||||
gs->last_message = "Used item!";
|
||||
gs->message_timer = 60;
|
||||
audio_play_item_pickup();
|
||||
return 1; // consume a turn
|
||||
}
|
||||
|
|
@ -103,45 +87,56 @@ static int handle_input(void) {
|
|||
// Reset combat message
|
||||
combat_reset_event();
|
||||
|
||||
// Player action
|
||||
// Check for item at target position before moving
|
||||
int new_x = gs->player.x + dx;
|
||||
int new_y = gs->player.y + dy;
|
||||
int will_pickup = 0;
|
||||
for (int i = 0; i < gs->item_count; i++) {
|
||||
if (!gs->items[i].picked_up && gs->items[i].x == new_x && gs->items[i].y == new_y) {
|
||||
will_pickup = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int action = player_move(&player, dx, dy, &map, enemies, enemy_count, items,
|
||||
item_count);
|
||||
// Player action
|
||||
int action = player_move(&gs->player, dx, dy, &gs->map, gs->enemies, gs->enemy_count, gs->items, gs->item_count);
|
||||
|
||||
if (action) {
|
||||
// Play pickup sound if item was picked up
|
||||
if (will_pickup) {
|
||||
audio_play_item_pickup();
|
||||
}
|
||||
// Increment turn counter
|
||||
turn_count++;
|
||||
gs->turn_count++;
|
||||
|
||||
// Check if stepped on stairs
|
||||
|
||||
if (map.tiles[player.y][player.x] == TILE_STAIRS) {
|
||||
if (gs->map.tiles[gs->player.y][gs->player.x] == TILE_STAIRS) {
|
||||
// Go to next floor
|
||||
if (player.floor < NUM_FLOORS) {
|
||||
if (gs->player.floor < NUM_FLOORS) {
|
||||
audio_play_stairs();
|
||||
init_floor(player.floor + 1);
|
||||
last_message = "Descended to next floor!";
|
||||
message_timer = 60;
|
||||
init_floor(gs, gs->player.floor + 1);
|
||||
gs->last_message = "Descended to next floor!";
|
||||
gs->message_timer = 60;
|
||||
} else {
|
||||
// Won the game
|
||||
game_won = 1;
|
||||
game_over = 1;
|
||||
gs->game_won = 1;
|
||||
gs->game_over = 1;
|
||||
}
|
||||
}
|
||||
|
||||
// Check if killed enemy
|
||||
|
||||
if (combat_get_last_message() != NULL && !combat_was_player_damage()) {
|
||||
// Check if enemy died
|
||||
for (int i = 0; i < enemy_count; i++) {
|
||||
if (!enemies[i].alive) {
|
||||
for (int i = 0; i < gs->enemy_count; i++) {
|
||||
if (!gs->enemies[i].alive) {
|
||||
audio_play_enemy_death();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Enemy turn - only every other turn for fairness
|
||||
if (turn_count % 2 == 0) {
|
||||
enemy_update_all(enemies, enemy_count, &player, &map);
|
||||
if (gs->turn_count % 2 == 0) {
|
||||
enemy_update_all(gs->enemies, gs->enemy_count, &gs->player, &gs->map);
|
||||
}
|
||||
|
||||
// Check if player took damage
|
||||
|
|
@ -150,12 +145,12 @@ static int handle_input(void) {
|
|||
}
|
||||
|
||||
// Set message
|
||||
last_message = combat_get_last_message();
|
||||
message_timer = 60;
|
||||
gs->last_message = combat_get_last_message();
|
||||
gs->message_timer = 60;
|
||||
|
||||
// Check game over
|
||||
if (player.hp <= 0) {
|
||||
game_over = 1;
|
||||
if (gs->player.hp <= 0) {
|
||||
gs->game_over = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -165,17 +160,20 @@ static int handle_input(void) {
|
|||
|
||||
// Main game loop
|
||||
static void game_loop(void) {
|
||||
GameState gs;
|
||||
memset(&gs, 0, sizeof(GameState));
|
||||
|
||||
// Initialize first floor
|
||||
rng_seed(12345);
|
||||
init_floor(1);
|
||||
init_floor(&gs, 1);
|
||||
|
||||
// Disable esc to exit
|
||||
SetExitKey(0);
|
||||
|
||||
while (!WindowShouldClose()) {
|
||||
// Handle input
|
||||
if (!game_over) {
|
||||
int quit = handle_input();
|
||||
if (!gs.game_over) {
|
||||
int quit = handle_input(&gs);
|
||||
if (quit == -1)
|
||||
break;
|
||||
} else {
|
||||
|
|
@ -183,41 +181,41 @@ static void game_loop(void) {
|
|||
if (IsKeyPressed(KEY_Q))
|
||||
break;
|
||||
if (IsKeyPressed(KEY_R)) {
|
||||
game_over = 0;
|
||||
game_won = 0;
|
||||
init_floor(1);
|
||||
memset(&gs, 0, sizeof(GameState));
|
||||
gs.game_over = 0;
|
||||
gs.game_won = 0;
|
||||
init_floor(&gs, 1);
|
||||
}
|
||||
}
|
||||
|
||||
// Update message timer
|
||||
if (message_timer > 0)
|
||||
message_timer--;
|
||||
if (gs.message_timer > 0)
|
||||
gs.message_timer--;
|
||||
|
||||
// Render
|
||||
BeginDrawing();
|
||||
ClearBackground(BLACK);
|
||||
|
||||
// Draw game elements
|
||||
render_map(&map);
|
||||
render_items(items, item_count);
|
||||
render_enemies(enemies, enemy_count);
|
||||
render_player(&player);
|
||||
render_ui(&player);
|
||||
render_map(&gs.map);
|
||||
render_items(gs.items, gs.item_count);
|
||||
render_enemies(gs.enemies, gs.enemy_count);
|
||||
render_player(&gs.player);
|
||||
render_ui(&gs.player);
|
||||
|
||||
// Draw message if any
|
||||
if (last_message != NULL && message_timer > 0) {
|
||||
render_message(last_message);
|
||||
if (gs.last_message != NULL && gs.message_timer > 0) {
|
||||
render_message(gs.last_message);
|
||||
}
|
||||
|
||||
// Draw game over screen
|
||||
if (game_over) {
|
||||
if (gs.game_over) {
|
||||
render_game_over();
|
||||
if (game_won) {
|
||||
if (gs.game_won) {
|
||||
// Draw win message
|
||||
const char *win_msg = "YOU WIN! ESCAPED THE DUNGEON!";
|
||||
int msg_w = MeasureText(win_msg, 30);
|
||||
DrawText(win_msg, (SCREEN_WIDTH - msg_w) / 2, SCREEN_HEIGHT / 2 - 80,
|
||||
30, GOLD);
|
||||
DrawText(win_msg, (SCREEN_WIDTH - msg_w) / 2, SCREEN_HEIGHT / 2 - 80, 30, GOLD);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
void player_init(Player *p, int x, int y);
|
||||
|
||||
// Move player, return 1 if moved/attacked, 0 if blocked
|
||||
int player_move(Player *p, int dx, int dy, Map *map, Enemy *enemies,
|
||||
int enemy_count, Item *items, int item_count);
|
||||
int player_move(Player *p, int dx, int dy, Map *map, Enemy *enemies, int enemy_count, Item *items, int item_count);
|
||||
|
||||
// Player attacks enemy (deal damage)
|
||||
void player_attack(Player *p, Enemy *e);
|
||||
|
|
|
|||
10
src/render.h
10
src/render.h
|
|
@ -4,19 +4,19 @@
|
|||
#include "common.h"
|
||||
|
||||
// Render the map tiles
|
||||
void render_map(Map *map);
|
||||
void render_map(const Map *map);
|
||||
|
||||
// Render the player
|
||||
void render_player(Player *p);
|
||||
void render_player(const Player *p);
|
||||
|
||||
// Render all enemies
|
||||
void render_enemies(Enemy *enemies, int count);
|
||||
void render_enemies(const Enemy *enemies, int count);
|
||||
|
||||
// Render all items
|
||||
void render_items(Item *items, int count);
|
||||
void render_items(const Item *items, int count);
|
||||
|
||||
// Render UI overlay
|
||||
void render_ui(Player *p);
|
||||
void render_ui(const Player *p);
|
||||
|
||||
// Render game over screen
|
||||
void render_game_over(void);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue