Converted Party into CharacterSystem

1 files changed, 8 insertions, 10 deletions

@@ -2,19 +2,20 @@
 #include <memory>
 #include "renderer.h"
 #include "game.h"
-#include "party.h"
 #include "timer.h"
 #include "map.h"
 #include "mixer.h"
 #include "transform_system.h"
 #include "camera_system.h"
 #include "animation_system.h"
+#include "character_system.h"
 
 void loop(Renderer& renderer, Mixer& mixer) {
   Game game;
   game.emplaceSystem<TransformSystem>();
   game.emplaceSystem<CameraSystem>();
   game.emplaceSystem<AnimationSystem>();
+  game.emplaceSystem<CharacterSystem>();
 
   Input keystate;
 
@@ -28,20 +29,17 @@ void loop(Renderer& renderer, Mixer& mixer) {
   int kumaSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
   game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/kuma_anim.txt", renderer);
+  game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, kumaSprite);
 
   int dusterSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32});
   game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/duster_anim.txt", renderer);
+  game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, dusterSprite);
 
   int boneySprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(boneySprite, {32, 32});
   game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/boney_anim.txt", renderer);
-
-  Party party;
-  party.addMember(game, lucasSprite);
-  party.addMember(game, kumaSprite);
-  party.addMember(game, dusterSprite);
-  party.addMember(game, boneySprite);
+  game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, boneySprite);
 
   game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite);
   game.getSystem<CameraSystem>().unlockCamera();
@@ -62,9 +60,9 @@ void loop(Renderer& renderer, Mixer& mixer) {
       if (e.type == SDL_QUIT || (e.type == SDL_KEYDOWN && e.key.keysym.sym == SDLK_ESCAPE)) {
         return;
       } else if (e.type == SDL_KEYDOWN && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) {
-        party.beginCrouch(game);
+        game.getSystem<CharacterSystem>().beginCrouch(lucasSprite);
       } else if (e.type == SDL_KEYUP && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) {
-        party.endCrouch(game);
+        game.getSystem<CharacterSystem>().endCrouch(lucasSprite);
       }
     }
 
@@ -76,7 +74,7 @@ void loop(Renderer& renderer, Mixer& mixer) {
 
     inputTimer.accumulate(frameTime);
     while (inputTimer.step()) {
-      party.move(game, mixer, keystate);
+      game.getSystem<CharacterSystem>().moveSprite(lucasSprite, mixer, keystate);
     }
 
     for (System& system : game.systems()) {