From d3ad149b7c3fbc89ede9a3e2c065c2ebb859dbbf Mon Sep 17 00:00:00 2001 From: Cameron Reikes Date: Sun, 3 Sep 2023 13:42:00 -0700 Subject: [PATCH] Disable angel screen, add skull asset --- assets.mdesk | 4 ++++ assets/skull.png | 3 +++ main.c | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 assets/skull.png diff --git a/assets.mdesk b/assets.mdesk index 5061be1..50c2f2b 100644 --- a/assets.mdesk +++ b/assets.mdesk @@ -14,6 +14,10 @@ { filepath: "unread_triangle.png", } +@image skull: +{ + filepath: "skull.png", +} @image loading: { filepath: "loading.png", diff --git a/assets/skull.png b/assets/skull.png new file mode 100644 index 0000000..e1e1e69 --- /dev/null +++ b/assets/skull.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b45b638cb38b20762eba50d5e8a8aa2801bd41bd5af39401d12a28a57ef39607 +size 65422 diff --git a/main.c b/main.c index 63cb647..52950cb 100644 --- a/main.c +++ b/main.c @@ -2173,7 +2173,7 @@ void transition_to_room(GameState *gs, ThreeDeeLevel *level, MD_String8 new_room gs->player->current_room_name = new_room_name; - if(MD_S8Match(new_room_name, MD_S8Lit("StartingLevel"), 0)) + if(MD_S8Match(new_room_name, MD_S8Lit("StartingRoom"), 0)) { gs->angel->perceptions_dirty = true; } @@ -2220,6 +2220,8 @@ void initialize_gamestate_from_threedee_level(GameState *gs, ThreeDeeLevel *leve it->target_rotation = it->rotation; } + transition_to_room(gs, &level_threedee, MD_S8Lit("Forest")); // hack to disable cold opening angel sequence right now + // @Place(parse and enact the drama document parse drama) if(1) {