From 00f7d8dd3dc47ed3cfa951325e809a92c37341b7 Mon Sep 17 00:00:00 2001 From: rodri Date: Thu, 13 Apr 2023 11:09:13 +0000 Subject: now using PNG files instead of image(6)s. bullet TTL taken into account during stepping. --- musw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'musw.c') diff --git a/musw.c b/musw.c index 019410a..75dea1a 100644 --- a/musw.c +++ b/musw.c @@ -526,7 +526,7 @@ redraw(void) case GSPlaying: drawship(&universe->ships[0], screenb); drawship(&universe->ships[1], screenb); - universe->star.spr->draw(universe->star.spr, screenb, subpt(toscreen(universe->star.p), Pt(16,16))); + universe->star.spr->draw(universe->star.spr, screenb, subpt(toscreen(universe->star.p), divpt(universe->star.spr->r.max, 2))); break; } @@ -659,9 +659,9 @@ threadmain(int argc, char *argv[]) sysfatal("readvmodel: %r"); universe->ships[0].mdl = needlemdl; universe->ships[1].mdl = wedgemdl; - universe->star.spr = readsprite("assets/spr/pulsar.pic", ZP, Rect(0,0,64,64), 9, 50); + universe->star.spr = readpngsprite("assets/spr/pulsar.png", ZP, Rect(0,0,64,64), 9, 50); - intro = readsprite("assets/spr/intro.pic", ZP, Rect(0,0,640,480), 1, 0); + intro = readpngsprite("assets/spr/intro.png", ZP, Rect(0,0,640,480), 28, 100); gamestates[GSIntro].δ = intro_δ; gamestates[GSConnecting].δ = connecting_δ; @@ -697,6 +697,7 @@ threadmain(int argc, char *argv[]) gamestate = gamestate->δ(gamestate, &frametime); universe->star.spr->step(universe->star.spr, frametime/1e6); + intro->step(intro, frametime/1e6); redraw(); -- cgit v1.2.3