diff options
| author | rodri <rgl@antares-labs.eu> | 2023-04-13 11:09:13 +0000 |
|---|---|---|
| committer | rodri <rgl@antares-labs.eu> | 2023-04-13 11:09:13 +0000 |
| commit | 00f7d8dd3dc47ed3cfa951325e809a92c37341b7 (patch) | |
| tree | bfe2916f4c3d4f0b5f659563bb61586633e7578b /musw.c | |
| parent | 42ea627853d79a54ef956a831e2f8badff5bfdb8 (diff) | |
| download | musw-00f7d8dd3dc47ed3cfa951325e809a92c37341b7.tar.gz musw-00f7d8dd3dc47ed3cfa951325e809a92c37341b7.tar.bz2 musw-00f7d8dd3dc47ed3cfa951325e809a92c37341b7.zip | |
now using PNG files instead of image(6)s. bullet TTL taken into account during stepping.
Diffstat (limited to 'musw.c')
| -rw-r--r-- | musw.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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(); |