aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--collision_system.c4
-rwxr-xr-xdistrib.sh9
-rw-r--r--enemy.c1
-rw-r--r--game.c2
-rw-r--r--wave.c45
5 files changed, 50 insertions, 11 deletions
diff --git a/collision_system.c b/collision_system.c
index 6d8368c..ca319f2 100644
--- a/collision_system.c
+++ b/collision_system.c
@@ -8,6 +8,7 @@
#include "fx.h"
#include "game_config.h"
#include "rect.h"
+#include "sound.h"
#include "standard.h"
#include "world.h"
@@ -185,7 +186,6 @@ void collision_system(World* world) {
unsigned bits;
CPosition* pos0, * pos1;
const CCollider* col0, * col1;
- const CEnemy* e0, * e1;
Collision_Side side;
for (i = 0; i < world->entity_count; i++) {
@@ -268,7 +268,6 @@ void collision_system(World* world) {
) { continue; }
pos0 = &world->positions[i];
- e0 = &world->enemies[i];
for (j = i + 1; j < world->entity_count; j++) {
bits = world->bitmask[j];
@@ -278,7 +277,6 @@ void collision_system(World* world) {
) { continue; }
pos1 = &world->positions[j];
- e1 = &world->enemies[j];
dx = (pos0->x - pos1->x) >> 4;
dy = (pos0->y - pos1->y) >> 4;
diff --git a/distrib.sh b/distrib.sh
index d2a486f..22001bf 100755
--- a/distrib.sh
+++ b/distrib.sh
@@ -1,9 +1,10 @@
#!/bin/bash
mkdir -p distrib
+rm distrib/*
make clean
-make -j6 config=release_gnu64
+make config=release_gnu64
zip distrib/gnu64.zip mallocbullet pack
make emscripten
@@ -13,13 +14,13 @@ zip ../../distrib/emscripten.zip index.html mallocbullet.js mallocbullet.wasm
cd ../../
make clean
-make -j6 config=release_gnu32
+make config=release_gnu32
zip distrib/gnu32.zip mallocbullet pack
make clean
-make -j6 config=release_win32
+make config=release_win32
zip distrib/win32.zip mallocbullet.exe pack SDL2.dll
make clean
-make -j6 config=release_win64
+make config=release_win64
zip distrib/win64.zip mallocbullet.exe pack SDL2.dll
diff --git a/enemy.c b/enemy.c
index e6d7a88..2c0a9e9 100644
--- a/enemy.c
+++ b/enemy.c
@@ -2,6 +2,7 @@
#include "components.h"
#include "debris.h"
#include "game_config.h"
+#include "sound.h"
#include "sprite.h"
#include "standard.h"
#include "world.h"
diff --git a/game.c b/game.c
index bb96e43..e741687 100644
--- a/game.c
+++ b/game.c
@@ -286,7 +286,7 @@ static void credits_update(Game* game) {
rfont_text(font, 0, 10, "Design: quou");
rfont_text(font, 0, 20, "Sound: quou");
rfont_text(font, 0, 30, "Graphics: quou");
- rfont_text(font, 0, 20, "Music: tejeez");
+ rfont_text(font, 0, 40, "Music: tejeez");
rfont_text(font, 0, 50, "Source Code: git.quou.xyz");
}
diff --git a/wave.c b/wave.c
index e6f4e44..f10d27f 100644
--- a/wave.c
+++ b/wave.c
@@ -11,7 +11,7 @@ static const Wave waves[] = {
2,
{
{ 3, 5 },
- { 15, 15 },
+ { 15, 15 }
}
}
},
@@ -25,7 +25,7 @@ static const Wave waves[] = {
2,
{
{ 3, 5 },
- { 15, 15 },
+ { 15, 15 }
}
},
{
@@ -35,12 +35,50 @@ static const Wave waves[] = {
{ 30, 30 },
{ 15, 20 },
{ 23, 5 },
- { 6, 4 },
+ { 6, 4 }
}
},
},
2,
6
+ },
+ {
+ {
+ {
+ 30,
+ 2,
+ {
+ { 6, 16 },
+ { 18, 8 }
+ }
+ },
+ {
+ 100,
+ 2,
+ {
+ { 12, 4 },
+ { 27, 7 }
+ }
+ },
+ {
+ 100,
+ 2,
+ {
+ { 11, 7 },
+ { 21, 26 }
+ }
+ },
+ {
+ 100,
+ 2,
+ {
+ { 2, 24 },
+ { 14, 22 }
+ }
+ },
+ },
+ 4,
+ 8
}
};
@@ -86,6 +124,7 @@ void update_waver(Waver* waver, World* world) {
(spawn->y * map_tile_size) << fbits
);
}
+ waver->timer = 0;
waver->sidx++;
}
}