diff --git a/TODO b/TODO
index fe485b2..caa0b9d 100644
--- a/TODO
+++ b/TODO
@@ -13,8 +13,7 @@ Major:
-- Escort commands.
-- Improved graphics.
- -- Nebulae -> pre-generated plasma fractals (for a cloudlike effect).
- -- Have ships flying in nebulae leave traces.
+ -- Have ships flying in nebulae leave traces.
-- Missile smoke.
-- Engine glow -> need models.
-- More special effects.
diff --git a/dat/ssys.xml b/dat/ssys.xml
index 5a10b27..ae8850b 100644
--- a/dat/ssys.xml
+++ b/dat/ssys.xml
@@ -102,34 +102,6 @@
200
-
-
- Sml Merchant Convoy
- Pirate Hyena
- Merchant Llama
- Merchant Mule
- Militia Lancelot
-
-
- Cygnus
- Borla
- Eridani
- NCG-7273
- Alteris
-
-
- -10
- 28
-
-
- Caladan
-
-
- 0
- 0
- 500
-
-
Collective Sml Swarm
@@ -298,6 +270,7 @@
0
0
+ 100
600
@@ -385,15 +358,9 @@
- Empire Lancelot
- Empire Lancelot
- Empire Sml Defense
- Merchant Mule
- Merchant Mule
- Pirate Hyena
- Pirate Hyena
- Pirate Hyena
Pirate Hyena
+ Empire Pacifier
+ Pirate Hyena
NCG-7968
@@ -406,6 +373,7 @@
0
0
+ 200
300
@@ -434,6 +402,25 @@
200
+
+
+ Merchant Llama
+ Pirate Hyena
+
+
+ NCG-7690
+
+
+ 148
+ -74
+
+
+
+ 0
+ 0
+ 100
+
+
Merchant Llama
@@ -477,6 +464,7 @@
0
0
+ 150
400
@@ -502,6 +490,7 @@
0
0
+ 100
500
@@ -745,23 +734,32 @@
200
-
+
- Merchant Llama
- Pirate Hyena
+ Sml Merchant Convoy
+ Pirate Hyena
+ Merchant Llama
+ Merchant Mule
+ Militia Lancelot
- NCG-7690
+ Cygnus
+ Borla
+ Eridani
+ NCG-7273
+ Alteris
- 148
- -74
+ -10
+ 28
-
+
+ Caladan
+
0
0
- 100
+ 500
\ No newline at end of file
diff --git a/src/nebulae.c b/src/nebulae.c
index da56d49..be48db9 100644
--- a/src/nebulae.c
+++ b/src/nebulae.c
@@ -353,9 +353,8 @@ void nebu_renderPuffs(const double dt, int below_player) {
/* Calculate new position. */
if(!paused) {
- /* TODO: WTF?!? */
- /*nebu_puffs[i].x -= player->solid->vel.x * nebu_puffs[i].height * dt;*/
- /*nebu_puffs[i].y -= player->solid->vel.y * nebu_puffs[i].height * dt;*/
+ nebu_puffs[i].x -= player->solid->vel.x * nebu_puffs[i].height * dt;
+ nebu_puffs[i].y -= player->solid->vel.y * nebu_puffs[i].height * dt;
}
/* Check boundaries. */
@@ -386,11 +385,14 @@ void nebu_prep(double density, double volatility) {
nebu_npuffs = density/4.;
nebu_puffs = realloc(nebu_puffs, sizeof(NebulaePuff)*nebu_npuffs);
for(i = 0; i < nebu_npuffs; i++) {
- nebu_puffs[i].tex = RNG(0, NEBULAE_PUFFS-1);
+ /* Position. */
nebu_puffs[i].x = (double)RNG(-NEBULAE_PUFF_BUFFER,
SCREEN_W + NEBULAE_PUFF_BUFFER);
nebu_puffs[i].y = (double)RNG(-NEBULAE_PUFF_BUFFER,
SCREEN_H + NEBULAE_PUFF_BUFFER);
+
+ /* Maybe make the size related. */
+ nebu_puffs[i].tex = RNG(0, NEBULAE_PUFFS-1);
nebu_puffs[i].height = RNGF() + 0.2;
}
}