lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into switching_to_draw_batches

Browse source
This commit is contained in:
Llywelwyn 2023-09-23 10:12:26 +01:00
commit 441b22439f
119 changed files with 1851 additions and 3612 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/states/state.rs
View file

@ -1,5 +1,5 @@
use specs::prelude::*;
use rltk::prelude::*;
use bracket_lib::prelude::*;
use super::runstate::RunState;
use crate::map::*;
use crate::hunger_system;
@ -125,10 +125,10 @@ impl State {
.append("You head to")
.colour(rgb_to_u8(get_local_col(id)))
.append_n(&mapname)
.colour(rltk::WHITE)
.colour(WHITE)
.period()
.log();
gamelog::record_event(EVENT::CHANGED_FLOOR(mapname));
gamelog::record_event(EVENT::ChangedFloor(mapname));
}
fn game_over_cleanup(&mut self) {
@ -152,12 +152,12 @@ impl State {
self.generate_world_map(1, TileType::Floor);
gamelog::setup_log();
gamelog::record_event(EVENT::LEVEL(1));
gamelog::record_event(EVENT::Level(1));
}
}
impl GameState for State {
fn tick(&mut self, ctx: &mut Rltk) {
fn tick(&mut self, ctx: &mut BTerm) {
let mut new_runstate;
{
let runstate = self.ecs.fetch::<RunState>();
@ -518,7 +518,7 @@ impl GameState for State {
let result = gui::show_help(ctx);
match result {
gui::YesNoResult::Yes => {
gamelog::record_event(EVENT::LOOKED_FOR_HELP(1));
gamelog::record_event(EVENT::LookedForHelp(1));
new_runstate = RunState::AwaitingInput;
}
_ => {}
@ -591,6 +591,6 @@ impl GameState for State {
damage_system::delete_the_dead(&mut self.ecs);
let _ = rltk::render_draw_buffer(ctx);
let _ = render_draw_buffer(ctx);
}
}