Browse Source

Fixing some things up to avoid crashes.
Remove unneeded BS

Sam Jaffe 6 years ago
parent
commit
99e7a74db9
3 changed files with 19 additions and 5 deletions
  1. 18 0
      Resources/scripts/entity/elder-dragon.json
  2. 0 4
      danmaku/GameView.mm
  3. 1 1
      src/entity/enemy.cxx

+ 18 - 0
Resources/scripts/entity/elder-dragon.json

@@ -0,0 +1,18 @@
+{
+  "name":"ElderDragon",
+  "type":"enemy",
+  "hp":300,
+  "scale":100,
+  "solid":true,
+  "points":{
+    "damage":20,
+    "kill":1000
+  },
+  "material":{
+    "texture":{
+      "uniform":"u_diffuseMap"
+    }
+  },
+  "attack":[
+  ]
+}

+ 0 - 4
danmaku/GameView.mm

@@ -23,10 +23,6 @@ namespace env { namespace detail {
 @implementation GameView {
   std::shared_ptr<graphics::direct_renderer> renderer;
   std::shared_ptr<engine::game_dispatch> game;
-};
-
-- (id)initWithCoder:(NSCoder *)decoder {
-  return self = [super initWithCoder:decoder];
 }
 
 - (id)initWithFrame:(NSRect)aRect {

+ 1 - 1
src/entity/enemy.cxx

@@ -24,7 +24,7 @@ enemy::enemy(Json::Value const & json, graphics::object const & obj,
 
 void enemy::update(float delta) {
   entity::update(delta);
-  attack_[0]->update(delta);
+  if (!attack_.empty()) { attack_[0]->update(delta); }
 }
 
 std::unique_ptr<enemy> make_enemy(Json::Value const & json,