diff options
author | nathansmithsmith <thenathansmithsmith@gmail.com> | 2023-12-04 12:28:26 -0700 |
---|---|---|
committer | nathansmithsmith <thenathansmithsmith@gmail.com> | 2023-12-04 12:28:26 -0700 |
commit | 3da57634be30691f23915296024baebca3b6297f (patch) | |
tree | dfd9926ea30cbccc3a4ce22e6c31d09bf1429c45 /src | |
parent | f70e2018a4d3f979e1108981284a09a44bd11542 (diff) |
Started level 6
Diffstat (limited to 'src')
-rw-r--r-- | src/game.c | 2 | ||||
-rw-r--r-- | src/levels.c | 1 | ||||
-rw-r--r-- | src/levels.h | 2 | ||||
-rw-r--r-- | src/levels/level5.c | 17 | ||||
-rw-r--r-- | src/levels/level6.c | 16 | ||||
-rw-r--r-- | src/levels/level6.h | 11 | ||||
-rw-r--r-- | src/levelsInclude.h | 1 |
7 files changed, 43 insertions, 7 deletions
@@ -33,7 +33,7 @@ void initGame(Game * game) { // Levels. initLevels(&game->levels); - startLevel(game, &game->levels, 4); + startLevel(game, &game->levels, 5); } void closeGame(Game * game) { diff --git a/src/levels.c b/src/levels.c index 3eee7c4..460077e 100644 --- a/src/levels.c +++ b/src/levels.c @@ -10,6 +10,7 @@ const LevelInfo levelInfoList[LEVELS_COUNT] = { (LevelInfo){initLevel3, closelevel3, updateLevel3}, (LevelInfo){initLevel4, closelevel4, updateLevel4}, (LevelInfo){initLevel5, closelevel5, updateLevel5}, + (LevelInfo){initLevel6, closelevel6, updateLevel6}, (LevelInfo){initTestLevel, closeTestLevel, updateTestLevel} }; diff --git a/src/levels.h b/src/levels.h index d9230a8..cd219d1 100644 --- a/src/levels.h +++ b/src/levels.h @@ -5,7 +5,7 @@ #ifndef LEVELS_H #define LEVELS_H -#define LEVELS_COUNT 6 +#define LEVELS_COUNT 7 #define NO_LEVEL -1 diff --git a/src/levels/level5.c b/src/levels/level5.c index bc29b29..3b7bcdc 100644 --- a/src/levels/level5.c +++ b/src/levels/level5.c @@ -42,10 +42,14 @@ bool updateLevel5(Game * game, Levels * levels) { case 0: if (game->world.entitiesCount == 1) { WorldEntry entries[] = { - (WorldEntry){ENTITY_SERGENTE, Vector3Add((Vector3){0.0, 0.0, 800.0}, playerPosition), QuaternionIdentity()}, - (WorldEntry){ENTITY_SERGENTE, Vector3Add((Vector3){0.0, 0.0, -800.0}, playerPosition), QuaternionIdentity()}, - (WorldEntry){ENTITY_SERGENTE, Vector3Add((Vector3){0.0, 800.0, 0.0}, playerPosition), QuaternionIdentity()}, - (WorldEntry){ENTITY_SERGENTE, Vector3Add((Vector3){0.0, -800.0, 0.0}, playerPosition), QuaternionIdentity()} + (WorldEntry){ENTITY_SERGENTE, + Vector3Add((Vector3){0.0, 0.0, 800.0}, playerPosition), QuaternionIdentity()}, + (WorldEntry){ENTITY_SERGENTE, + Vector3Add((Vector3){0.0, 0.0, -800.0}, playerPosition), QuaternionIdentity()}, + (WorldEntry){ENTITY_SERGENTE, + Vector3Add((Vector3){0.0, 800.0, 0.0}, playerPosition), QuaternionIdentity()}, + (WorldEntry){ENTITY_SERGENTE, + Vector3Add((Vector3){0.0, -800.0, 0.0}, playerPosition), QuaternionIdentity()} }; addEntriesToWorld( @@ -68,7 +72,10 @@ bool updateLevel5(Game * game, Levels * levels) { ENTITY_SOLDATO, 10, Vector3Add( - Vector3Scale(Vector3RotateByQuaternion((Vector3){0.5, 0.0, 1.0}, player->rotation), distanceFromPlayer), + Vector3Scale( + Vector3RotateByQuaternion((Vector3){0.5, 0.0, 1.0}, player->rotation), + distanceFromPlayer + ), playerPosition ), (Vector3){0.0, 10.0, 10.0} diff --git a/src/levels/level6.c b/src/levels/level6.c new file mode 100644 index 0000000..08e4a55 --- /dev/null +++ b/src/levels/level6.c @@ -0,0 +1,16 @@ +#include "game.h" +#include "world.h" +#include "entity.h" +#include "entityGrouping.h" + +void initLevel6(Game * game, Levels * levels) { + // Add player. + addEntryToWorld(&game->world, game, (WorldEntry){ENTITY_ANTIFA, (Vector3){0.0, 0.0, 0.0}, QuaternionIdentity()}); +} + +void closelevel6(Levels * levels) { +} + +bool updateLevel6(Game * game, Levels * levels) { + return false; +} diff --git a/src/levels/level6.h b/src/levels/level6.h new file mode 100644 index 0000000..de4c747 --- /dev/null +++ b/src/levels/level6.h @@ -0,0 +1,11 @@ +#include "gameCommon.h" +#include "levels.h" + +#ifndef LEVEL6_H +#define LEVEL6_H + +void initLevel6(Game * game, Levels * levels); +void closelevel6(Levels * levels); +bool updateLevel6(Game * game, Levels * levels); + +#endif diff --git a/src/levelsInclude.h b/src/levelsInclude.h index 6d76c7c..72697e0 100644 --- a/src/levelsInclude.h +++ b/src/levelsInclude.h @@ -4,5 +4,6 @@ #include "levels/level3.h" #include "levels/level4.h" #include "levels/level5.h" +#include "levels/level6.h" // As you can tell I fucking hate your stupid fat ass |