Moved the ship image definitions to C code.
Now, this has an unfortunate effect of screwing up cutscenes. I'll fix that by moving cutscene definitions to C as well.
This commit is contained in:
onpon4
parent
c07f5678aa
commit
0da184f424
|
|
@ -10,7 +10,7 @@
|
|||
030 +++ ADDITIONAL PROGRAMMING +++
|
||||
020 Richard Sweeney
|
||||
020 Guus Sliepen
|
||||
020 Julian Marchant
|
||||
020 onpon4
|
||||
050 +++ QUALITY ASSURANCE AND ADVICE +++
|
||||
030 Sam Lantinga Ian Bissett
|
||||
020 Chris Taylor Xan Christoph Reichenbach
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
2 gfx/dualFighter1.png
|
||||
3 gfx/dualFighter2.png
|
||||
4 gfx/missileBoat1.png
|
||||
5 gfx/missileBoat2.png
|
||||
6 gfx/eliteFighter1.png
|
||||
7 gfx/eliteFighter2.png
|
||||
8 gfx/aimFighter1.png
|
||||
9 gfx/aimFighter2.png
|
||||
10 gfx/slaveTrans1.png
|
||||
11 gfx/slaveTrans2.png
|
||||
12 gfx/goodTrans1.png
|
||||
13 gfx/goodTrans2.png
|
||||
14 gfx/transport1.png
|
||||
15 gfx/transport2.png
|
||||
16 gfx/miner1.png
|
||||
17 gfx/miner2.png
|
||||
18 gfx/kline11.png
|
||||
19 gfx/kline12.png
|
||||
20 gfx/wingmate1.png
|
||||
21 gfx/wingmate2.png
|
||||
22 gfx/tug1.png
|
||||
23 gfx/tug2.png
|
||||
24 gfx/sid1.png
|
||||
25 gfx/sid2.png
|
||||
26 gfx/mineBoss1.png
|
||||
27 gfx/mineBoss2.png
|
||||
28 gfx/mineBossWing11.png
|
||||
29 gfx/mineBossWing12.png
|
||||
30 gfx/mineBossWing21.png
|
||||
31 gfx/mineBossWing22.png
|
||||
32 gfx/mineBossWing31.png
|
||||
33 gfx/mineBossWing32.png
|
||||
34 gfx/mineBossWing41.png
|
||||
35 gfx/mineBossWing42.png
|
||||
36 gfx/drone1.png
|
||||
37 gfx/drone2.png
|
||||
38 gfx/asteroid1.png
|
||||
39 gfx/asteroid2.png
|
||||
40 gfx/asteroid3.png
|
||||
-1
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
2 gfx/dualFighter1.png
|
||||
3 gfx/dualFighter2.png
|
||||
4 gfx/missileBoat1.png
|
||||
5 gfx/missileBoat2.png
|
||||
6 gfx/eliteFighter1.png
|
||||
7 gfx/eliteFighter2.png
|
||||
8 gfx/aimFighter1.png
|
||||
9 gfx/aimFighter2.png
|
||||
10 gfx/cloakShip1.png
|
||||
11 gfx/cloakShip2.png
|
||||
12 gfx/evilUrsula1.png
|
||||
13 gfx/evilUrsula2.png
|
||||
14 gfx/transport1.png
|
||||
15 gfx/transport2.png
|
||||
16 gfx/miner1.png
|
||||
17 gfx/miner2.png
|
||||
18 gfx/kline11.png
|
||||
19 gfx/kline12.png
|
||||
20 gfx/wingmate1.png
|
||||
21 gfx/wingmate2.png
|
||||
22 gfx/tug1.png
|
||||
23 gfx/tug2.png
|
||||
24 gfx/sid1.png
|
||||
25 gfx/sid2.png
|
||||
26 gfx/merc1.png
|
||||
27 gfx/merc2.png
|
||||
28 gfx/execTrans1.png
|
||||
29 gfx/execTrans2.png
|
||||
30 gfx/escort1.png
|
||||
31 gfx/escort2.png
|
||||
32 gfx/rebelCarrier1.png
|
||||
33 gfx/rebelCarrier2.png
|
||||
34 gfx/drone1.png
|
||||
35 gfx/drone2.png
|
||||
36 gfx/drone1.png
|
||||
37 gfx/drone2.png
|
||||
38 gfx/asteroid1.png
|
||||
39 gfx/asteroid2.png
|
||||
40 gfx/asteroid3.png
|
||||
41 gfx/mineBoss1.png
|
||||
42 gfx/mineBoss2.png
|
||||
43 gfx/mineBossWing11.png
|
||||
44 gfx/mineBossWing12.png
|
||||
45 gfx/mineBossWing21.png
|
||||
46 gfx/mineBossWing22.png
|
||||
47 gfx/mineBossWing31.png
|
||||
48 gfx/mineBossWing32.png
|
||||
49 gfx/mineBossWing41.png
|
||||
50 gfx/mineBossWing42.png
|
||||
|
||||
-1
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
2 gfx/dualFighter1.png
|
||||
3 gfx/dualFighter2.png
|
||||
4 gfx/missileBoat1.png
|
||||
5 gfx/missileBoat2.png
|
||||
6 gfx/eliteFighter1.png
|
||||
7 gfx/eliteFighter2.png
|
||||
8 gfx/aimFighter1.png
|
||||
9 gfx/aimFighter2.png
|
||||
10 gfx/mobileCannon1.png
|
||||
11 gfx/mobileCannon2.png
|
||||
12 gfx/plutoBoss1.png
|
||||
13 gfx/plutoBoss2.png
|
||||
14 gfx/transport1.png
|
||||
15 gfx/transport2.png
|
||||
16 gfx/miner1.png
|
||||
17 gfx/miner2.png
|
||||
18 gfx/kline11.png
|
||||
19 gfx/kline12.png
|
||||
20 gfx/wingmate1.png
|
||||
21 gfx/wingmate2.png
|
||||
22 gfx/tug1.png
|
||||
23 gfx/tug2.png
|
||||
24 gfx/sid1.png
|
||||
25 gfx/sid2.png
|
||||
26 gfx/merc1.png
|
||||
27 gfx/merc2.png
|
||||
30 gfx/escort1.png
|
||||
31 gfx/escort2.png
|
||||
32 gfx/barrier.png
|
||||
33 gfx/barrier.png
|
||||
34 gfx/mobileShield1.png
|
||||
35 gfx/mobileShield2.png
|
||||
36 gfx/drone1.png
|
||||
37 gfx/drone2.png
|
||||
38 gfx/asteroid1.png
|
||||
39 gfx/asteroid2.png
|
||||
40 gfx/asteroid3.png
|
||||
41 gfx/splitBoss11.png
|
||||
42 gfx/splitBoss12.png
|
||||
43 gfx/splitBoss21.png
|
||||
44 gfx/splitBoss22.png
|
||||
45 gfx/splitBoss31.png
|
||||
46 gfx/splitBoss32.png
|
||||
-1
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
2 gfx/dualFighter1.png
|
||||
3 gfx/dualFighter2.png
|
||||
4 gfx/missileBoat1.png
|
||||
5 gfx/missileBoat2.png
|
||||
6 gfx/eliteFighter1.png
|
||||
7 gfx/eliteFighter2.png
|
||||
8 gfx/frigateBody1.png
|
||||
9 gfx/frigateBody2.png
|
||||
10 gfx/frigateGun11.png
|
||||
11 gfx/frigateGun12.png
|
||||
12 gfx/frigateGun21.png
|
||||
13 gfx/frigateGun22.png
|
||||
14 gfx/transport1.png
|
||||
15 gfx/transport2.png
|
||||
16 gfx/miner1.png
|
||||
17 gfx/miner2.png
|
||||
18 gfx/kline11.png
|
||||
19 gfx/kline12.png
|
||||
22 gfx/tug1.png
|
||||
23 gfx/tug2.png
|
||||
24 gfx/sid1.png
|
||||
25 gfx/sid2.png
|
||||
-1
|
||||
152
src/alien.cpp
152
src/alien.cpp
|
|
@ -48,8 +48,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_DUALFIGHTER].speed = 4;
|
||||
alien_defs[CD_DUALFIGHTER].maxShield = 5;
|
||||
alien_defs[CD_DUALFIGHTER].shield = 5;
|
||||
alien_defs[CD_DUALFIGHTER].imageIndex[0] = 2;
|
||||
alien_defs[CD_DUALFIGHTER].imageIndex[1] = 3;
|
||||
alien_defs[CD_DUALFIGHTER].imageIndex[0] = SS_DUALFIGHTER;
|
||||
alien_defs[CD_DUALFIGHTER].imageIndex[1] = SS_DUALFIGHTER_L;
|
||||
alien_defs[CD_DUALFIGHTER].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_DUALFIGHTER].weaponType[1] = W_ROCKETS;
|
||||
alien_defs[CD_DUALFIGHTER].chance[0] = 100;
|
||||
|
|
@ -65,8 +65,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_MISSILEBOAT].speed = 2;
|
||||
alien_defs[CD_MISSILEBOAT].maxShield = 50;
|
||||
alien_defs[CD_MISSILEBOAT].shield = 50;
|
||||
alien_defs[CD_MISSILEBOAT].imageIndex[0] = 4;
|
||||
alien_defs[CD_MISSILEBOAT].imageIndex[1] = 5;
|
||||
alien_defs[CD_MISSILEBOAT].imageIndex[0] = SS_MISSILEBOAT;
|
||||
alien_defs[CD_MISSILEBOAT].imageIndex[1] = SS_MISSILEBOAT_L;
|
||||
alien_defs[CD_MISSILEBOAT].weaponType[0] = W_ROCKETS;
|
||||
alien_defs[CD_MISSILEBOAT].weaponType[1] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_MISSILEBOAT].chance[0] = 25;
|
||||
|
|
@ -82,8 +82,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_PROTOFIGHTER].speed = 5;
|
||||
alien_defs[CD_PROTOFIGHTER].maxShield = 15;
|
||||
alien_defs[CD_PROTOFIGHTER].shield = 15;
|
||||
alien_defs[CD_PROTOFIGHTER].imageIndex[0] = 6;
|
||||
alien_defs[CD_PROTOFIGHTER].imageIndex[1] = 7;
|
||||
alien_defs[CD_PROTOFIGHTER].imageIndex[0] = SS_PROTOFIGHTER;
|
||||
alien_defs[CD_PROTOFIGHTER].imageIndex[1] = SS_PROTOFIGHTER_L;
|
||||
alien_defs[CD_PROTOFIGHTER].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_PROTOFIGHTER].weaponType[1] = P_ANYTHING;
|
||||
alien_defs[CD_PROTOFIGHTER].chance[0] = 100;
|
||||
|
|
@ -99,8 +99,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_FRIEND].speed = 3;
|
||||
alien_defs[CD_FRIEND].maxShield = 50;
|
||||
alien_defs[CD_FRIEND].shield = 50;
|
||||
alien_defs[CD_FRIEND].imageIndex[0] = 20;
|
||||
alien_defs[CD_FRIEND].imageIndex[1] = 21;
|
||||
alien_defs[CD_FRIEND].imageIndex[0] = SS_FRIEND;
|
||||
alien_defs[CD_FRIEND].imageIndex[1] = SS_FRIEND_L;
|
||||
alien_defs[CD_FRIEND].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_FRIEND].weaponType[1] = W_HOMING_MISSILE;
|
||||
alien_defs[CD_FRIEND].chance[0] = 100;
|
||||
|
|
@ -116,8 +116,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_FRIGATE].speed = 2;
|
||||
alien_defs[CD_FRIGATE].maxShield = 550;
|
||||
alien_defs[CD_FRIGATE].shield = 550;
|
||||
alien_defs[CD_FRIGATE].imageIndex[0] = 8;
|
||||
alien_defs[CD_FRIGATE].imageIndex[1] = 9;
|
||||
alien_defs[CD_FRIGATE].imageIndex[0] = SS_FRIGATE;
|
||||
alien_defs[CD_FRIGATE].imageIndex[1] = SS_FRIGATE_L;
|
||||
alien_defs[CD_FRIGATE].weaponType[0] = W_MICRO_ROCKETS;
|
||||
alien_defs[CD_FRIGATE].weaponType[1] = W_ENERGYRAY;
|
||||
alien_defs[CD_FRIGATE].chance[0] = 100;
|
||||
|
|
@ -132,8 +132,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_FRIGATE_WING1].speed = 2;
|
||||
alien_defs[CD_FRIGATE_WING1].maxShield = 100;
|
||||
alien_defs[CD_FRIGATE_WING1].shield = 100;
|
||||
alien_defs[CD_FRIGATE_WING1].imageIndex[0] = 10;
|
||||
alien_defs[CD_FRIGATE_WING1].imageIndex[1] = 11;
|
||||
alien_defs[CD_FRIGATE_WING1].imageIndex[0] = SS_FRIGATE_WING1;
|
||||
alien_defs[CD_FRIGATE_WING1].imageIndex[1] = SS_FRIGATE_WING1_L;
|
||||
alien_defs[CD_FRIGATE_WING1].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_FRIGATE_WING1].weaponType[1] = W_ROCKETS;
|
||||
alien_defs[CD_FRIGATE_WING1].chance[0] = 100;
|
||||
|
|
@ -148,8 +148,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_FRIGATE_WING2].speed = 2;
|
||||
alien_defs[CD_FRIGATE_WING2].maxShield = 100;
|
||||
alien_defs[CD_FRIGATE_WING2].shield = 100;
|
||||
alien_defs[CD_FRIGATE_WING2].imageIndex[0] = 12;
|
||||
alien_defs[CD_FRIGATE_WING2].imageIndex[1] = 13;
|
||||
alien_defs[CD_FRIGATE_WING2].imageIndex[0] = SS_FRIGATE_WING2;
|
||||
alien_defs[CD_FRIGATE_WING2].imageIndex[1] = SS_FRIGATE_WING2_L;
|
||||
alien_defs[CD_FRIGATE_WING2].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_FRIGATE_WING2].weaponType[1] = W_ROCKETS;
|
||||
alien_defs[CD_FRIGATE_WING2].chance[0] = 100;
|
||||
|
|
@ -165,8 +165,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_TRANSPORTSHIP].speed = 4;
|
||||
alien_defs[CD_TRANSPORTSHIP].maxShield = 10;
|
||||
alien_defs[CD_TRANSPORTSHIP].shield = 10;
|
||||
alien_defs[CD_TRANSPORTSHIP].imageIndex[0] = 14;
|
||||
alien_defs[CD_TRANSPORTSHIP].imageIndex[1] = 15;
|
||||
alien_defs[CD_TRANSPORTSHIP].imageIndex[0] = SS_TRANSPORTSHIP;
|
||||
alien_defs[CD_TRANSPORTSHIP].imageIndex[1] = SS_TRANSPORTSHIP_L;
|
||||
alien_defs[CD_TRANSPORTSHIP].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_TRANSPORTSHIP].weaponType[1] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_TRANSPORTSHIP].chance[0] = 0;
|
||||
|
|
@ -182,8 +182,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_CARGOSHIP].speed = 4;
|
||||
alien_defs[CD_CARGOSHIP].maxShield = 10;
|
||||
alien_defs[CD_CARGOSHIP].shield = 10;
|
||||
alien_defs[CD_CARGOSHIP].imageIndex[0] = 22;
|
||||
alien_defs[CD_CARGOSHIP].imageIndex[1] = 23;
|
||||
alien_defs[CD_CARGOSHIP].imageIndex[0] = SS_CARGOSHIP;
|
||||
alien_defs[CD_CARGOSHIP].imageIndex[1] = SS_CARGOSHIP_L;
|
||||
alien_defs[CD_CARGOSHIP].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_CARGOSHIP].weaponType[1] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_CARGOSHIP].chance[0] = 0;
|
||||
|
|
@ -199,8 +199,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_MINER].speed = 4;
|
||||
alien_defs[CD_MINER].maxShield = 25;
|
||||
alien_defs[CD_MINER].shield = 25;
|
||||
alien_defs[CD_MINER].imageIndex[0] = 16;
|
||||
alien_defs[CD_MINER].imageIndex[1] = 17;
|
||||
alien_defs[CD_MINER].imageIndex[0] = SS_MINER;
|
||||
alien_defs[CD_MINER].imageIndex[1] = SS_MINER_L;
|
||||
alien_defs[CD_MINER].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_MINER].weaponType[1] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_MINER].chance[0] = 0;
|
||||
|
|
@ -216,8 +216,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_KLINE].speed = 5;
|
||||
alien_defs[CD_KLINE].maxShield = 2000;
|
||||
alien_defs[CD_KLINE].shield = 2000;
|
||||
alien_defs[CD_KLINE].imageIndex[0] = 18;
|
||||
alien_defs[CD_KLINE].imageIndex[1] = 19;
|
||||
alien_defs[CD_KLINE].imageIndex[0] = SS_KLINE;
|
||||
alien_defs[CD_KLINE].imageIndex[1] = SS_KLINE_L;
|
||||
alien_defs[CD_KLINE].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_KLINE].weaponType[1] = W_MICRO_ROCKETS;
|
||||
alien_defs[CD_KLINE].chance[0] = 100;
|
||||
|
|
@ -233,8 +233,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_AIMFIGHTER].speed = 3;
|
||||
alien_defs[CD_AIMFIGHTER].maxShield = 15;
|
||||
alien_defs[CD_AIMFIGHTER].shield = 15;
|
||||
alien_defs[CD_AIMFIGHTER].imageIndex[0] = 8;
|
||||
alien_defs[CD_AIMFIGHTER].imageIndex[1] = 9;
|
||||
alien_defs[CD_AIMFIGHTER].imageIndex[0] = SS_AIMFIGHTER;
|
||||
alien_defs[CD_AIMFIGHTER].imageIndex[1] = SS_AIMFIGHTER_L;
|
||||
alien_defs[CD_AIMFIGHTER].weaponType[0] = W_AIMED_SHOT;
|
||||
alien_defs[CD_AIMFIGHTER].weaponType[1] = W_AIMED_SHOT;
|
||||
alien_defs[CD_AIMFIGHTER].chance[0] = 7;
|
||||
|
|
@ -250,8 +250,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_SLAVETRANSPORT].speed = 2;
|
||||
alien_defs[CD_SLAVETRANSPORT].maxShield = 10;
|
||||
alien_defs[CD_SLAVETRANSPORT].shield = 20;
|
||||
alien_defs[CD_SLAVETRANSPORT].imageIndex[0] = 10;
|
||||
alien_defs[CD_SLAVETRANSPORT].imageIndex[1] = 11;
|
||||
alien_defs[CD_SLAVETRANSPORT].imageIndex[0] = SS_SLAVETRANSPORT;
|
||||
alien_defs[CD_SLAVETRANSPORT].imageIndex[1] = SS_SLAVETRANSPORT_L;
|
||||
alien_defs[CD_SLAVETRANSPORT].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_SLAVETRANSPORT].weaponType[1] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_SLAVETRANSPORT].chance[0] = 0;
|
||||
|
|
@ -267,8 +267,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_GOODTRANSPORT].speed = 3;
|
||||
alien_defs[CD_GOODTRANSPORT].maxShield = 75;
|
||||
alien_defs[CD_GOODTRANSPORT].shield = 75;
|
||||
alien_defs[CD_GOODTRANSPORT].imageIndex[0] = 12;
|
||||
alien_defs[CD_GOODTRANSPORT].imageIndex[1] = 13;
|
||||
alien_defs[CD_GOODTRANSPORT].imageIndex[0] = SS_GOODTRANSPORT;
|
||||
alien_defs[CD_GOODTRANSPORT].imageIndex[1] = SS_GOODTRANSPORT_L;
|
||||
alien_defs[CD_GOODTRANSPORT].weaponType[0] = W_AIMED_SHOT;
|
||||
alien_defs[CD_GOODTRANSPORT].weaponType[1] = W_AIMED_SHOT;
|
||||
alien_defs[CD_GOODTRANSPORT].chance[0] = 100;
|
||||
|
|
@ -284,8 +284,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_SID].speed = 3;
|
||||
alien_defs[CD_SID].maxShield = 50;
|
||||
alien_defs[CD_SID].shield = 50;
|
||||
alien_defs[CD_SID].imageIndex[0] = 24;
|
||||
alien_defs[CD_SID].imageIndex[1] = 25;
|
||||
alien_defs[CD_SID].imageIndex[0] = SS_SID;
|
||||
alien_defs[CD_SID].imageIndex[1] = SS_SID_L;
|
||||
alien_defs[CD_SID].weaponType[0] = W_IONCANNON;
|
||||
alien_defs[CD_SID].weaponType[1] = W_IONCANNON;
|
||||
alien_defs[CD_SID].chance[0] = 100;
|
||||
|
|
@ -301,8 +301,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_MINEBOSS].speed = 3;
|
||||
alien_defs[CD_MINEBOSS].maxShield = 1000;
|
||||
alien_defs[CD_MINEBOSS].shield = 1000;
|
||||
alien_defs[CD_MINEBOSS].imageIndex[0] = 26;
|
||||
alien_defs[CD_MINEBOSS].imageIndex[1] = 27;
|
||||
alien_defs[CD_MINEBOSS].imageIndex[0] = SS_MINERBOSS;
|
||||
alien_defs[CD_MINEBOSS].imageIndex[1] = SS_MINERBOSS_L;
|
||||
alien_defs[CD_MINEBOSS].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_MINEBOSS].weaponType[1] = W_SPREADSHOT;
|
||||
alien_defs[CD_MINEBOSS].chance[0] = 0;
|
||||
|
|
@ -317,8 +317,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_BOSS2_WING1].speed = 1;
|
||||
alien_defs[CD_BOSS2_WING1].maxShield = 250;
|
||||
alien_defs[CD_BOSS2_WING1].shield = 250;
|
||||
alien_defs[CD_BOSS2_WING1].imageIndex[0] = 28;
|
||||
alien_defs[CD_BOSS2_WING1].imageIndex[1] = 29;
|
||||
alien_defs[CD_BOSS2_WING1].imageIndex[0] = SS_MINERBOSS_WING1;
|
||||
alien_defs[CD_BOSS2_WING1].imageIndex[1] = SS_MINERBOSS_WING1_L;
|
||||
alien_defs[CD_BOSS2_WING1].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_BOSS2_WING1].weaponType[1] = W_SPREADSHOT;
|
||||
alien_defs[CD_BOSS2_WING1].chance[0] = 0;
|
||||
|
|
@ -333,8 +333,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_BOSS2_WING2].speed = 1;
|
||||
alien_defs[CD_BOSS2_WING2].maxShield = 500;
|
||||
alien_defs[CD_BOSS2_WING2].shield = 500;
|
||||
alien_defs[CD_BOSS2_WING2].imageIndex[0] = 30;
|
||||
alien_defs[CD_BOSS2_WING2].imageIndex[1] = 31;
|
||||
alien_defs[CD_BOSS2_WING2].imageIndex[0] = SS_MINERBOSS_WING2;
|
||||
alien_defs[CD_BOSS2_WING2].imageIndex[1] = SS_MINERBOSS_WING2_L;
|
||||
alien_defs[CD_BOSS2_WING2].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_BOSS2_WING2].weaponType[1] = W_SPREADSHOT;
|
||||
alien_defs[CD_BOSS2_WING2].chance[0] = 0;
|
||||
|
|
@ -349,8 +349,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_BOSS2_WING3].speed = 1;
|
||||
alien_defs[CD_BOSS2_WING3].maxShield = 500;
|
||||
alien_defs[CD_BOSS2_WING3].shield = 500;
|
||||
alien_defs[CD_BOSS2_WING3].imageIndex[0] = 32;
|
||||
alien_defs[CD_BOSS2_WING3].imageIndex[1] = 33;
|
||||
alien_defs[CD_BOSS2_WING3].imageIndex[0] = SS_MINERBOSS_WING3;
|
||||
alien_defs[CD_BOSS2_WING3].imageIndex[1] = SS_MINERBOSS_WING3_L;
|
||||
alien_defs[CD_BOSS2_WING3].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_BOSS2_WING3].weaponType[1] = W_SPREADSHOT;
|
||||
alien_defs[CD_BOSS2_WING3].chance[0] = 0;
|
||||
|
|
@ -365,8 +365,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_BOSS2_WING4].speed = 1;
|
||||
alien_defs[CD_BOSS2_WING4].maxShield = 250;
|
||||
alien_defs[CD_BOSS2_WING4].shield = 250;
|
||||
alien_defs[CD_BOSS2_WING4].imageIndex[0] = 34;
|
||||
alien_defs[CD_BOSS2_WING4].imageIndex[1] = 35;
|
||||
alien_defs[CD_BOSS2_WING4].imageIndex[0] = SS_MINERBOSS_WING4;
|
||||
alien_defs[CD_BOSS2_WING4].imageIndex[1] = SS_MINERBOSS_WING4_L;
|
||||
alien_defs[CD_BOSS2_WING4].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_BOSS2_WING4].weaponType[1] = W_SPREADSHOT;
|
||||
alien_defs[CD_BOSS2_WING4].chance[0] = 0;
|
||||
|
|
@ -382,8 +382,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_DRONE].speed = 8;
|
||||
alien_defs[CD_DRONE].maxShield = 5;
|
||||
alien_defs[CD_DRONE].shield = 5;
|
||||
alien_defs[CD_DRONE].imageIndex[0] = 36;
|
||||
alien_defs[CD_DRONE].imageIndex[1] = 37;
|
||||
alien_defs[CD_DRONE].imageIndex[0] = SS_DRONE;
|
||||
alien_defs[CD_DRONE].imageIndex[1] = SS_DRONE_L;
|
||||
alien_defs[CD_DRONE].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_DRONE].weaponType[1] = W_LASER;
|
||||
alien_defs[CD_DRONE].chance[0] = 100;
|
||||
|
|
@ -399,8 +399,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_CLOAKFIGHTER].speed = 6;
|
||||
alien_defs[CD_CLOAKFIGHTER].maxShield = 1000;
|
||||
alien_defs[CD_CLOAKFIGHTER].shield = 1000;
|
||||
alien_defs[CD_CLOAKFIGHTER].imageIndex[0] = 10;
|
||||
alien_defs[CD_CLOAKFIGHTER].imageIndex[1] = 11;
|
||||
alien_defs[CD_CLOAKFIGHTER].imageIndex[0] = SS_CLOAKFIGHTER;
|
||||
alien_defs[CD_CLOAKFIGHTER].imageIndex[1] = SS_CLOAKFIGHTER_L;
|
||||
alien_defs[CD_CLOAKFIGHTER].weaponType[0] = W_SPREADSHOT;
|
||||
alien_defs[CD_CLOAKFIGHTER].weaponType[1] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_CLOAKFIGHTER].chance[0] = 100;
|
||||
|
|
@ -416,8 +416,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_EVILURSULA].speed = 5;
|
||||
alien_defs[CD_EVILURSULA].maxShield = 500;
|
||||
alien_defs[CD_EVILURSULA].shield = 500;
|
||||
alien_defs[CD_EVILURSULA].imageIndex[0] = 12;
|
||||
alien_defs[CD_EVILURSULA].imageIndex[1] = 13;
|
||||
alien_defs[CD_EVILURSULA].imageIndex[0] = SS_EVILURSULA;
|
||||
alien_defs[CD_EVILURSULA].imageIndex[1] = SS_EVILURSULA_L;
|
||||
alien_defs[CD_EVILURSULA].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_EVILURSULA].weaponType[1] = W_HOMING_MISSILE;
|
||||
alien_defs[CD_EVILURSULA].chance[0] = 100;
|
||||
|
|
@ -433,8 +433,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_KRASS].speed = 5;
|
||||
alien_defs[CD_KRASS].maxShield = 1000;
|
||||
alien_defs[CD_KRASS].shield = 1000;
|
||||
alien_defs[CD_KRASS].imageIndex[0] = 26;
|
||||
alien_defs[CD_KRASS].imageIndex[1] = 27;
|
||||
alien_defs[CD_KRASS].imageIndex[0] = SS_KRASS;
|
||||
alien_defs[CD_KRASS].imageIndex[1] = SS_KRASS_L;
|
||||
alien_defs[CD_KRASS].weaponType[0] = W_SPREADSHOT;
|
||||
alien_defs[CD_KRASS].weaponType[1] = W_CHARGER;
|
||||
alien_defs[CD_KRASS].chance[0] = 100;
|
||||
|
|
@ -450,8 +450,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_EXEC].speed = 5;
|
||||
alien_defs[CD_EXEC].maxShield = 1000;
|
||||
alien_defs[CD_EXEC].shield = 1000;
|
||||
alien_defs[CD_EXEC].imageIndex[0] = 28;
|
||||
alien_defs[CD_EXEC].imageIndex[1] = 28;
|
||||
alien_defs[CD_EXEC].imageIndex[0] = SS_EXEC;
|
||||
alien_defs[CD_EXEC].imageIndex[1] = SS_EXEC_L;
|
||||
alien_defs[CD_EXEC].weaponType[0] = W_SPREADSHOT;
|
||||
alien_defs[CD_EXEC].weaponType[1] = W_HOMING_MISSILE;
|
||||
alien_defs[CD_EXEC].chance[0] = 0;
|
||||
|
|
@ -467,8 +467,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_ASTEROID].speed = 1;
|
||||
alien_defs[CD_ASTEROID].maxShield = 50;
|
||||
alien_defs[CD_ASTEROID].shield = 50;
|
||||
alien_defs[CD_ASTEROID].imageIndex[0] = 38;
|
||||
alien_defs[CD_ASTEROID].imageIndex[1] = 38;
|
||||
alien_defs[CD_ASTEROID].imageIndex[0] = SS_ASTEROID;
|
||||
alien_defs[CD_ASTEROID].imageIndex[1] = SS_ASTEROID;
|
||||
alien_defs[CD_ASTEROID].weaponType[0] = W_SPREADSHOT;
|
||||
alien_defs[CD_ASTEROID].weaponType[1] = W_HOMING_MISSILE;
|
||||
alien_defs[CD_ASTEROID].chance[0] = 0;
|
||||
|
|
@ -483,8 +483,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_ASTEROID2].speed = 1;
|
||||
alien_defs[CD_ASTEROID2].maxShield = 10;
|
||||
alien_defs[CD_ASTEROID2].shield = 10;
|
||||
alien_defs[CD_ASTEROID2].imageIndex[0] = 39;
|
||||
alien_defs[CD_ASTEROID2].imageIndex[1] = 40;
|
||||
alien_defs[CD_ASTEROID2].imageIndex[0] = SS_ASTEROID_SMALL;
|
||||
alien_defs[CD_ASTEROID2].imageIndex[1] = SS_ASTEROID_SMALL_L;
|
||||
alien_defs[CD_ASTEROID2].weaponType[0] = W_SPREADSHOT;
|
||||
alien_defs[CD_ASTEROID2].weaponType[1] = W_HOMING_MISSILE;
|
||||
alien_defs[CD_ASTEROID2].chance[0] = 0;
|
||||
|
|
@ -500,8 +500,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_ESCORT].speed = 3;
|
||||
alien_defs[CD_ESCORT].maxShield = 200;
|
||||
alien_defs[CD_ESCORT].shield = 200;
|
||||
alien_defs[CD_ESCORT].imageIndex[0] = 30;
|
||||
alien_defs[CD_ESCORT].imageIndex[1] = 31;
|
||||
alien_defs[CD_ESCORT].imageIndex[0] = SS_ESCORT;
|
||||
alien_defs[CD_ESCORT].imageIndex[1] = SS_ESCORT_L;
|
||||
alien_defs[CD_ESCORT].weaponType[0] = W_LASER;
|
||||
alien_defs[CD_ESCORT].weaponType[1] = W_LASER;
|
||||
alien_defs[CD_ESCORT].chance[0] = 25;
|
||||
|
|
@ -517,8 +517,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_MOBILE_RAY].speed = 5;
|
||||
alien_defs[CD_MOBILE_RAY].maxShield = 250;
|
||||
alien_defs[CD_MOBILE_RAY].shield = 250;
|
||||
alien_defs[CD_MOBILE_RAY].imageIndex[0] = 10;
|
||||
alien_defs[CD_MOBILE_RAY].imageIndex[1] = 11;
|
||||
alien_defs[CD_MOBILE_RAY].imageIndex[0] = SS_MOBILE_RAY;
|
||||
alien_defs[CD_MOBILE_RAY].imageIndex[1] = SS_MOBILE_RAY_L;
|
||||
alien_defs[CD_MOBILE_RAY].weaponType[0] = W_ENERGYRAY;
|
||||
alien_defs[CD_MOBILE_RAY].weaponType[1] = W_ENERGYRAY;
|
||||
alien_defs[CD_MOBILE_RAY].chance[0] = 50;
|
||||
|
|
@ -534,8 +534,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_REBELCARRIER].speed = 2;
|
||||
alien_defs[CD_REBELCARRIER].maxShield = 100;
|
||||
alien_defs[CD_REBELCARRIER].shield = 100;
|
||||
alien_defs[CD_REBELCARRIER].imageIndex[0] = 32;
|
||||
alien_defs[CD_REBELCARRIER].imageIndex[1] = 33;
|
||||
alien_defs[CD_REBELCARRIER].imageIndex[0] = SS_REBELCARRIER;
|
||||
alien_defs[CD_REBELCARRIER].imageIndex[1] = SS_REBELCARRIER_L;
|
||||
alien_defs[CD_REBELCARRIER].weaponType[0] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_REBELCARRIER].weaponType[1] = W_MICRO_ROCKETS;
|
||||
alien_defs[CD_REBELCARRIER].chance[0] = 50;
|
||||
|
|
@ -551,8 +551,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_PLUTOBOSS].speed = 4;
|
||||
alien_defs[CD_PLUTOBOSS].maxShield = 500;
|
||||
alien_defs[CD_PLUTOBOSS].shield = 500;
|
||||
alien_defs[CD_PLUTOBOSS].imageIndex[0] = 12;
|
||||
alien_defs[CD_PLUTOBOSS].imageIndex[1] = 13;
|
||||
alien_defs[CD_PLUTOBOSS].imageIndex[0] = SS_PLUTOBOSS;
|
||||
alien_defs[CD_PLUTOBOSS].imageIndex[1] = SS_PLUTOBOSS_L;
|
||||
alien_defs[CD_PLUTOBOSS].weaponType[0] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_PLUTOBOSS].weaponType[1] = W_MICRO_ROCKETS;
|
||||
alien_defs[CD_PLUTOBOSS].chance[0] = 50;
|
||||
|
|
@ -568,8 +568,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_BARRIER].speed = 1;
|
||||
alien_defs[CD_BARRIER].maxShield = 250;
|
||||
alien_defs[CD_BARRIER].shield = 250;
|
||||
alien_defs[CD_BARRIER].imageIndex[0] = 32;
|
||||
alien_defs[CD_BARRIER].imageIndex[1] = 33;
|
||||
alien_defs[CD_BARRIER].imageIndex[0] = SS_BARRIER;
|
||||
alien_defs[CD_BARRIER].imageIndex[1] = SS_BARRIER;
|
||||
alien_defs[CD_BARRIER].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_BARRIER].weaponType[1] = W_MICRO_ROCKETS;
|
||||
alien_defs[CD_BARRIER].chance[0] = 0;
|
||||
|
|
@ -585,8 +585,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_NEPTUNEBOSS].speed = 4;
|
||||
alien_defs[CD_NEPTUNEBOSS].maxShield = 800;
|
||||
alien_defs[CD_NEPTUNEBOSS].shield = 800;
|
||||
alien_defs[CD_NEPTUNEBOSS].imageIndex[0] = 12;
|
||||
alien_defs[CD_NEPTUNEBOSS].imageIndex[1] = 13;
|
||||
alien_defs[CD_NEPTUNEBOSS].imageIndex[0] = SS_PLUTOBOSS;
|
||||
alien_defs[CD_NEPTUNEBOSS].imageIndex[1] = SS_PLUTOBOSS;
|
||||
alien_defs[CD_NEPTUNEBOSS].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_NEPTUNEBOSS].weaponType[1] = W_MICRO_ROCKETS;
|
||||
alien_defs[CD_NEPTUNEBOSS].chance[0] = 100;
|
||||
|
|
@ -602,8 +602,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_MOBILESHIELD].speed = 6;
|
||||
alien_defs[CD_MOBILESHIELD].maxShield = 150;
|
||||
alien_defs[CD_MOBILESHIELD].shield = 150;
|
||||
alien_defs[CD_MOBILESHIELD].imageIndex[0] = 34;
|
||||
alien_defs[CD_MOBILESHIELD].imageIndex[1] = 35;
|
||||
alien_defs[CD_MOBILESHIELD].imageIndex[0] = SS_MOBILESHIELD;
|
||||
alien_defs[CD_MOBILESHIELD].imageIndex[1] = SS_MOBILESHIELD;
|
||||
alien_defs[CD_MOBILESHIELD].weaponType[0] = W_DOUBLE_SHOT;
|
||||
alien_defs[CD_MOBILESHIELD].weaponType[1] = W_MICRO_ROCKETS;
|
||||
alien_defs[CD_MOBILESHIELD].chance[0] = 0;
|
||||
|
|
@ -619,8 +619,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_FIREFLY].speed = 5;
|
||||
alien_defs[CD_FIREFLY].maxShield = 250;
|
||||
alien_defs[CD_FIREFLY].shield = 250;
|
||||
alien_defs[CD_FIREFLY].imageIndex[0] = 0;
|
||||
alien_defs[CD_FIREFLY].imageIndex[1] = 1;
|
||||
alien_defs[CD_FIREFLY].imageIndex[0] = SS_FIREFLY;
|
||||
alien_defs[CD_FIREFLY].imageIndex[1] = SS_FIREFLY;
|
||||
alien_defs[CD_FIREFLY].weaponType[0] = W_TRIPLE_SHOT;
|
||||
alien_defs[CD_FIREFLY].weaponType[1] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_FIREFLY].chance[0] = 100;
|
||||
|
|
@ -636,8 +636,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_URANUSBOSS].speed = 4;
|
||||
alien_defs[CD_URANUSBOSS].maxShield = 750;
|
||||
alien_defs[CD_URANUSBOSS].shield = 750;
|
||||
alien_defs[CD_URANUSBOSS].imageIndex[0] = 41;
|
||||
alien_defs[CD_URANUSBOSS].imageIndex[1] = 42;
|
||||
alien_defs[CD_URANUSBOSS].imageIndex[0] = SS_URANUSBOSS;
|
||||
alien_defs[CD_URANUSBOSS].imageIndex[1] = SS_URANUSBOSS;
|
||||
alien_defs[CD_URANUSBOSS].weaponType[0] = W_SPREADSHOT;
|
||||
alien_defs[CD_URANUSBOSS].weaponType[1] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_URANUSBOSS].chance[0] = 100;
|
||||
|
|
@ -653,8 +653,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_URANUSBOSSWING1].speed = 4;
|
||||
alien_defs[CD_URANUSBOSSWING1].maxShield = 250;
|
||||
alien_defs[CD_URANUSBOSSWING1].shield = 250;
|
||||
alien_defs[CD_URANUSBOSSWING1].imageIndex[0] = 43;
|
||||
alien_defs[CD_URANUSBOSSWING1].imageIndex[1] = 44;
|
||||
alien_defs[CD_URANUSBOSSWING1].imageIndex[0] = SS_URANUSBOSS_WING1;
|
||||
alien_defs[CD_URANUSBOSSWING1].imageIndex[1] = SS_URANUSBOSS_WING1_L;
|
||||
alien_defs[CD_URANUSBOSSWING1].weaponType[0] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_URANUSBOSSWING1].weaponType[1] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_URANUSBOSSWING1].chance[0] = 5;
|
||||
|
|
@ -670,8 +670,8 @@ void alien_defs_init()
|
|||
alien_defs[CD_URANUSBOSSWING2].speed = 4;
|
||||
alien_defs[CD_URANUSBOSSWING2].maxShield = 250;
|
||||
alien_defs[CD_URANUSBOSSWING2].shield = 250;
|
||||
alien_defs[CD_URANUSBOSSWING2].imageIndex[0] = 45;
|
||||
alien_defs[CD_URANUSBOSSWING2].imageIndex[1] = 46;
|
||||
alien_defs[CD_URANUSBOSSWING2].imageIndex[0] = SS_URANUSBOSS_WING2;
|
||||
alien_defs[CD_URANUSBOSSWING2].imageIndex[1] = SS_URANUSBOSS_WING2_L;
|
||||
alien_defs[CD_URANUSBOSSWING2].weaponType[0] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_URANUSBOSSWING2].weaponType[1] = W_DOUBLE_ROCKETS;
|
||||
alien_defs[CD_URANUSBOSSWING2].chance[0] = 5;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ object *cargo_add(object *owner, int cargoType)
|
|||
cargo[index].collectType = cargoType;
|
||||
cargo[index].image[0] = gfx_sprites[32];
|
||||
if (cargoType == P_PHOEBE)
|
||||
cargo[index].image[0] = gfx_shipSprites[20];
|
||||
cargo[index].image[0] = gfx_shipSprites[SS_FRIEND];
|
||||
|
||||
return &cargo[index];
|
||||
}
|
||||
|
|
|
|||
92
src/defs.h
92
src/defs.h
|
|
@ -103,15 +103,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#define MAX_WEAPONS 20
|
||||
#define MAX_SPRITES 100
|
||||
#define MAX_SHIPSPRITES 120
|
||||
#define MAX_FONTSPRITES 6
|
||||
#define MAX_SHOPSPRITES 6
|
||||
#define MAX_CARGO 20
|
||||
#define MAX_INFOLINES 3
|
||||
#define MAX_EVENTS 20
|
||||
#define MAX_STATUSLINES 30
|
||||
|
||||
#define SHIP_HIT_INDEX 60
|
||||
|
||||
|
||||
enum keys {
|
||||
|
|
@ -282,9 +278,13 @@ enum {
|
|||
CD_URSULA
|
||||
};
|
||||
|
||||
// Sprites
|
||||
enum {
|
||||
};
|
||||
|
||||
// Face sprites
|
||||
enum {
|
||||
FS_CHRIS = 90,
|
||||
FS_CHRIS,
|
||||
FS_SID,
|
||||
FS_KRASS,
|
||||
FS_KLINE,
|
||||
|
|
@ -294,6 +294,88 @@ enum {
|
|||
FS_MAX
|
||||
};
|
||||
|
||||
// Ship sprites
|
||||
enum {
|
||||
SS_FIREFLY,
|
||||
SS_FIREFLY_L,
|
||||
SS_SID,
|
||||
SS_SID_L,
|
||||
SS_FRIEND,
|
||||
SS_FRIEND_L,
|
||||
SS_GOODTRANSPORT,
|
||||
SS_GOODTRANSPORT_L,
|
||||
SS_REBELCARRIER,
|
||||
SS_REBELCARRIER_L,
|
||||
SS_DUALFIGHTER,
|
||||
SS_DUALFIGHTER_L,
|
||||
SS_MISSILEBOAT,
|
||||
SS_MISSILEBOAT_L,
|
||||
SS_PROTOFIGHTER,
|
||||
SS_PROTOFIGHTER_L,
|
||||
SS_AIMFIGHTER,
|
||||
SS_AIMFIGHTER_L,
|
||||
SS_DRONE,
|
||||
SS_DRONE_L,
|
||||
SS_MINER,
|
||||
SS_MINER_L,
|
||||
SS_ESCORT,
|
||||
SS_ESCORT_L,
|
||||
SS_MOBILE_RAY,
|
||||
SS_MOBILE_RAY_L,
|
||||
SS_TRANSPORTSHIP,
|
||||
SS_TRANSPORTSHIP_L,
|
||||
SS_CARGOSHIP,
|
||||
SS_CARGOSHIP_L,
|
||||
SS_SLAVETRANSPORT,
|
||||
SS_SLAVETRANSPORT_L,
|
||||
SS_BARRIER,
|
||||
SS_MOBILESHIELD,
|
||||
SS_MOBILESHIELD_L,
|
||||
SS_ASTEROID,
|
||||
SS_ASTEROID_SMALL,
|
||||
SS_ASTEROID_SMALL_L,
|
||||
SS_CLOAKFIGHTER,
|
||||
SS_CLOAKFIGHTER_L,
|
||||
SS_EVILURSULA,
|
||||
SS_EVILURSULA_L,
|
||||
SS_KRASS,
|
||||
SS_KRASS_L,
|
||||
SS_FRIGATE,
|
||||
SS_FRIGATE_L,
|
||||
SS_FRIGATE_WING1,
|
||||
SS_FRIGATE_WING1_L,
|
||||
SS_FRIGATE_WING2,
|
||||
SS_FRIGATE_WING2_L,
|
||||
SS_MINERBOSS,
|
||||
SS_MINERBOSS_L,
|
||||
SS_MINERBOSS_WING1,
|
||||
SS_MINERBOSS_WING1_L,
|
||||
SS_MINERBOSS_WING2,
|
||||
SS_MINERBOSS_WING2_L,
|
||||
SS_MINERBOSS_WING3,
|
||||
SS_MINERBOSS_WING3_L,
|
||||
SS_MINERBOSS_WING4,
|
||||
SS_MINERBOSS_WING4_L,
|
||||
SS_EXEC,
|
||||
SS_EXEC_L,
|
||||
SS_PLUTOBOSS,
|
||||
SS_PLUTOBOSS_L,
|
||||
SS_URANUSBOSS,
|
||||
SS_URANUSBOSS_L,
|
||||
SS_URANUSBOSS_WING1,
|
||||
SS_URANUSBOSS_WING1_L,
|
||||
SS_URANUSBOSS_WING2,
|
||||
SS_URANUSBOSS_WING2_L,
|
||||
SS_KLINE,
|
||||
SS_KLINE_L,
|
||||
SS_HIT_INDEX,
|
||||
SS_MAX = SS_HIT_INDEX * 2
|
||||
};
|
||||
|
||||
// Shop sprites
|
||||
enum {
|
||||
};
|
||||
|
||||
// Text sprites (main menu)
|
||||
enum {
|
||||
// Main menu
|
||||
|
|
|
|||
|
|
@ -1071,7 +1071,7 @@ static void game_doAliens()
|
|||
shapeToUse = aliens[i].imageIndex[aliens[i].face];
|
||||
|
||||
if (aliens[i].hit)
|
||||
shapeToUse += SHIP_HIT_INDEX;
|
||||
shapeToUse += SS_HIT_INDEX;
|
||||
|
||||
LIMIT_ADD(aliens[i].hit, -1, 0, 100);
|
||||
|
||||
|
|
@ -1391,7 +1391,7 @@ static void game_doPlayer()
|
|||
shapeToUse = player.face;
|
||||
|
||||
if (player.hit)
|
||||
shapeToUse += SHIP_HIT_INDEX;
|
||||
shapeToUse += SS_HIT_INDEX;
|
||||
|
||||
LIMIT_ADD(player.hit, -1, 0, 100);
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
SDL_Surface *gfx_background;
|
||||
SDL_Surface *gfx_sprites[MAX_SPRITES];
|
||||
SDL_Surface *gfx_faceSprites[FS_MAX];
|
||||
SDL_Surface *gfx_shipSprites[MAX_SHIPSPRITES];
|
||||
SDL_Surface *gfx_shipSprites[SS_MAX];
|
||||
SDL_Surface *gfx_fontSprites[MAX_FONTSPRITES];
|
||||
SDL_Surface *gfx_shopSprites[MAX_SHOPSPRITES];
|
||||
textObject gfx_textSprites[TS_MAX];
|
||||
|
|
@ -39,7 +39,7 @@ void gfx_init()
|
|||
for (int i = 0 ; i < MAX_SPRITES ; i++)
|
||||
gfx_sprites[i] = NULL;
|
||||
|
||||
for (int i = 0 ; i < MAX_SHIPSPRITES ; i++)
|
||||
for (int i = 0 ; i < SS_MAX ; i++)
|
||||
gfx_shipSprites[i] = NULL;
|
||||
|
||||
for (int i = 0 ; i < TS_MAX ; i++)
|
||||
|
|
@ -462,7 +462,7 @@ void gfx_free()
|
|||
}
|
||||
}
|
||||
|
||||
for (int i = 0 ; i < MAX_SHIPSPRITES ; i++)
|
||||
for (int i = 0 ; i < SS_MAX ; i++)
|
||||
{
|
||||
if (gfx_shipSprites[i] != NULL)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
extern SDL_Surface *gfx_background;
|
||||
extern SDL_Surface *gfx_sprites[MAX_SPRITES];
|
||||
extern SDL_Surface *gfx_faceSprites[FS_MAX];
|
||||
extern SDL_Surface *gfx_shipSprites[MAX_SHIPSPRITES];
|
||||
extern SDL_Surface *gfx_shipSprites[SS_MAX];
|
||||
extern SDL_Surface *gfx_fontSprites[MAX_FONTSPRITES];
|
||||
extern SDL_Surface *gfx_shopSprites[MAX_SHOPSPRITES];
|
||||
extern textObject gfx_textSprites[TS_MAX];
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ void initPlayer()
|
|||
player.systemPower = player.maxShield;
|
||||
player.face = 0;
|
||||
|
||||
player.image[0] = gfx_shipSprites[0];
|
||||
player.image[1] = gfx_shipSprites[1];
|
||||
player.image[0] = gfx_shipSprites[SS_FIREFLY];
|
||||
player.image[1] = gfx_shipSprites[SS_FIREFLY_L];
|
||||
|
||||
player.engineX = player.image[0]->w;
|
||||
player.engineY = (player.image[0]->h / 2);
|
||||
|
|
|
|||
|
|
@ -52,46 +52,92 @@ void loadGameGraphics()
|
|||
gfx_faceSprites[FS_URSULA] = gfx_loadImage("gfx/face_ursula.png");
|
||||
gfx_faceSprites[FS_KLINE] = gfx_loadImage("gfx/face_kline.png");
|
||||
|
||||
switch(game.system)
|
||||
{
|
||||
case 0:
|
||||
strcpy(string, "data/resources_spirit.dat");
|
||||
break;
|
||||
case 1:
|
||||
strcpy(string, "data/resources_eyananth.dat");
|
||||
break;
|
||||
case 2:
|
||||
strcpy(string, "data/resources_mordor.dat");
|
||||
break;
|
||||
case 3:
|
||||
strcpy(string, "data/resources_sol.dat");
|
||||
break;
|
||||
}
|
||||
|
||||
fp = fopen(string, "rb");
|
||||
|
||||
if (fp == NULL)
|
||||
exit(1);
|
||||
|
||||
while (fscanf(fp, "%d %s", &index, string) == 2)
|
||||
{
|
||||
gfx_shipSprites[index] = gfx_loadImage(string);
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
// Ships
|
||||
gfx_shipSprites[SS_FIREFLY] = gfx_loadImage("gfx/firefly1.png");
|
||||
gfx_shipSprites[SS_FIREFLY_L] = gfx_loadImage("gfx/firefly2.png");
|
||||
gfx_shipSprites[SS_SID] = gfx_loadImage("gfx/sid1.png");
|
||||
gfx_shipSprites[SS_SID_L] = gfx_loadImage("gfx/sid2.png");
|
||||
gfx_shipSprites[SS_FRIEND] = gfx_loadImage("gfx/wingmate1.png");
|
||||
gfx_shipSprites[SS_FRIEND_L] = gfx_loadImage("gfx/wingmate2.png");
|
||||
gfx_shipSprites[SS_GOODTRANSPORT] = gfx_loadImage("gfx/goodTrans1.png");
|
||||
gfx_shipSprites[SS_GOODTRANSPORT_L] = gfx_loadImage("gfx/goodTrans2.png");
|
||||
gfx_shipSprites[SS_REBELCARRIER] = gfx_loadImage("gfx/rebelCarrier1.png");
|
||||
gfx_shipSprites[SS_REBELCARRIER_L] = gfx_loadImage("gfx/rebelCarrier2.png");
|
||||
gfx_shipSprites[SS_DUALFIGHTER] = gfx_loadImage("gfx/dualFighter1.png");
|
||||
gfx_shipSprites[SS_DUALFIGHTER_L] = gfx_loadImage("gfx/dualFighter2.png");
|
||||
gfx_shipSprites[SS_MISSILEBOAT] = gfx_loadImage("gfx/missileBoat1.png");
|
||||
gfx_shipSprites[SS_MISSILEBOAT_L] = gfx_loadImage("gfx/missileBoat2.png");
|
||||
gfx_shipSprites[SS_PROTOFIGHTER] = gfx_loadImage("gfx/eliteFighter1.png");
|
||||
gfx_shipSprites[SS_PROTOFIGHTER_L] = gfx_loadImage("gfx/eliteFighter2.png");
|
||||
gfx_shipSprites[SS_AIMFIGHTER] = gfx_loadImage("gfx/aimFighter1.png");
|
||||
gfx_shipSprites[SS_AIMFIGHTER_L] = gfx_loadImage("gfx/aimFighter2.png");
|
||||
gfx_shipSprites[SS_DRONE] = gfx_loadImage("gfx/drone1.png");
|
||||
gfx_shipSprites[SS_DRONE_L] = gfx_loadImage("gfx/drone2.png");
|
||||
gfx_shipSprites[SS_MINER] = gfx_loadImage("gfx/miner1.png");
|
||||
gfx_shipSprites[SS_MINER_L] = gfx_loadImage("gfx/miner2.png");
|
||||
gfx_shipSprites[SS_ESCORT] = gfx_loadImage("gfx/escort1.png");
|
||||
gfx_shipSprites[SS_ESCORT_L] = gfx_loadImage("gfx/escort2.png");
|
||||
gfx_shipSprites[SS_MOBILE_RAY] = gfx_loadImage("gfx/mobileCannon1.png");
|
||||
gfx_shipSprites[SS_MOBILE_RAY_L] = gfx_loadImage("gfx/mobileCannon2.png");
|
||||
gfx_shipSprites[SS_TRANSPORTSHIP] = gfx_loadImage("gfx/transport1.png");
|
||||
gfx_shipSprites[SS_TRANSPORTSHIP_L] = gfx_loadImage("gfx/transport2.png");
|
||||
gfx_shipSprites[SS_CARGOSHIP] = gfx_loadImage("gfx/tug1.png");
|
||||
gfx_shipSprites[SS_CARGOSHIP_L] = gfx_loadImage("gfx/tug2.png");
|
||||
gfx_shipSprites[SS_SLAVETRANSPORT] = gfx_loadImage("gfx/slaveTrans1.png");
|
||||
gfx_shipSprites[SS_SLAVETRANSPORT_L] = gfx_loadImage("gfx/slaveTrans2.png");
|
||||
gfx_shipSprites[SS_BARRIER] = gfx_loadImage("gfx/barrier.png");
|
||||
gfx_shipSprites[SS_MOBILESHIELD] = gfx_loadImage("gfx/mobileShield1.png");
|
||||
gfx_shipSprites[SS_MOBILESHIELD_L] = gfx_loadImage("gfx/mobileShield2.png");
|
||||
gfx_shipSprites[SS_ASTEROID] = gfx_loadImage("gfx/asteroid1.png");
|
||||
gfx_shipSprites[SS_ASTEROID_SMALL] = gfx_loadImage("gfx/asteroid2.png");
|
||||
gfx_shipSprites[SS_ASTEROID_SMALL_L] = gfx_loadImage("gfx/asteroid3.png");
|
||||
gfx_shipSprites[SS_CLOAKFIGHTER] = gfx_loadImage("gfx/cloakShip1.png");
|
||||
gfx_shipSprites[SS_CLOAKFIGHTER_L] = gfx_loadImage("gfx/cloakShip2.png");
|
||||
gfx_shipSprites[SS_EVILURSULA] = gfx_loadImage("gfx/evilUrsula1.png");
|
||||
gfx_shipSprites[SS_EVILURSULA_L] = gfx_loadImage("gfx/evilUrsula2.png");
|
||||
gfx_shipSprites[SS_KRASS] = gfx_loadImage("gfx/merc1.png");
|
||||
gfx_shipSprites[SS_KRASS_L] = gfx_loadImage("gfx/merc2.png");
|
||||
gfx_shipSprites[SS_FRIGATE] = gfx_loadImage("gfx/frigateBody1.png");
|
||||
gfx_shipSprites[SS_FRIGATE_L] = gfx_loadImage("gfx/frigateBody2.png");
|
||||
gfx_shipSprites[SS_FRIGATE_WING1] = gfx_loadImage("gfx/frigateGun11.png");
|
||||
gfx_shipSprites[SS_FRIGATE_WING1_L] = gfx_loadImage("gfx/frigateGun12.png");
|
||||
gfx_shipSprites[SS_FRIGATE_WING2] = gfx_loadImage("gfx/frigateGun21.png");
|
||||
gfx_shipSprites[SS_FRIGATE_WING2_L] = gfx_loadImage("gfx/frigateGun22.png");
|
||||
gfx_shipSprites[SS_MINERBOSS] = gfx_loadImage("gfx/mineBoss1.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_L] = gfx_loadImage("gfx/mineBoss2.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_WING1] = gfx_loadImage("gfx/mineBossWing11.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_WING1_L] = gfx_loadImage("gfx/mineBossWing12.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_WING2] = gfx_loadImage("gfx/mineBossWing21.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_WING2_L] = gfx_loadImage("gfx/mineBossWing22.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_WING3] = gfx_loadImage("gfx/mineBossWing31.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_WING3_L] = gfx_loadImage("gfx/mineBossWing32.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_WING4] = gfx_loadImage("gfx/mineBossWing41.png");
|
||||
gfx_shipSprites[SS_MINERBOSS_WING4_L] = gfx_loadImage("gfx/mineBossWing42.png");
|
||||
gfx_shipSprites[SS_EXEC] = gfx_loadImage("gfx/execTrans1.png");
|
||||
gfx_shipSprites[SS_EXEC_L] = gfx_loadImage("gfx/execTrans2.png");
|
||||
gfx_shipSprites[SS_PLUTOBOSS] = gfx_loadImage("gfx/plutoBoss1.png");
|
||||
gfx_shipSprites[SS_PLUTOBOSS_L] = gfx_loadImage("gfx/plutoBoss2.png");
|
||||
gfx_shipSprites[SS_URANUSBOSS] = gfx_loadImage("gfx/splitBoss11.png");
|
||||
gfx_shipSprites[SS_URANUSBOSS_L] = gfx_loadImage("gfx/splitBoss12.png");
|
||||
gfx_shipSprites[SS_URANUSBOSS_WING1] = gfx_loadImage("gfx/splitBoss21.png");
|
||||
gfx_shipSprites[SS_URANUSBOSS_WING1_L] = gfx_loadImage("gfx/splitBoss22.png");
|
||||
gfx_shipSprites[SS_URANUSBOSS_WING2] = gfx_loadImage("gfx/splitBoss31.png");
|
||||
gfx_shipSprites[SS_URANUSBOSS_WING2_L] = gfx_loadImage("gfx/splitBoss32.png");
|
||||
gfx_shipSprites[SS_KLINE] = gfx_loadImage("gfx/kline11.png");
|
||||
gfx_shipSprites[SS_KLINE_L] = gfx_loadImage("gfx/kline12.png");
|
||||
|
||||
/*
|
||||
Create images of ships being hit that show a lot of red
|
||||
*/
|
||||
for (int i = SHIP_HIT_INDEX ; i < MAX_SHIPSPRITES ; i++)
|
||||
for (int i = SS_HIT_INDEX ; i < SS_MAX ; i++)
|
||||
{
|
||||
if (gfx_shipSprites[i - SHIP_HIT_INDEX] == NULL)
|
||||
if (gfx_shipSprites[i - SS_HIT_INDEX] == NULL)
|
||||
continue;
|
||||
gfx_shipSprites[i] = gfx_createSurface(gfx_shipSprites[i - SHIP_HIT_INDEX]->w,
|
||||
gfx_shipSprites[i - SHIP_HIT_INDEX]->h);
|
||||
SDL_SetSurfaceBlendMode(gfx_shipSprites[i - SHIP_HIT_INDEX], SDL_BLENDMODE_NONE);
|
||||
gfx_blit(gfx_shipSprites[i - SHIP_HIT_INDEX], 0, 0, gfx_shipSprites[i]);
|
||||
SDL_SetSurfaceBlendMode(gfx_shipSprites[i - SHIP_HIT_INDEX], SDL_BLENDMODE_BLEND);
|
||||
gfx_shipSprites[i] = gfx_createSurface(gfx_shipSprites[i - SS_HIT_INDEX]->w,
|
||||
gfx_shipSprites[i - SS_HIT_INDEX]->h);
|
||||
SDL_SetSurfaceBlendMode(gfx_shipSprites[i - SS_HIT_INDEX], SDL_BLENDMODE_NONE);
|
||||
gfx_blit(gfx_shipSprites[i - SS_HIT_INDEX], 0, 0, gfx_shipSprites[i]);
|
||||
SDL_SetSurfaceBlendMode(gfx_shipSprites[i - SS_HIT_INDEX], SDL_BLENDMODE_BLEND);
|
||||
|
||||
switch (gfx_shipSprites[i]->format->BitsPerPixel)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue