Merge pull request #2062 from Semphriss/fix-badguy-deactivate

Semphriss · web-flow · commit faa54638e9b7 · 2022-01-11T10:17:38.000-05:00
Badguys no longer deactivate if they aren't alive
diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
@@ -173,8 +173,9 @@ BadGuy::update(float dt_sec)
       return;
     }
   }
-  if ((m_state != STATE_INACTIVE) && is_offscreen()) {
-    if (m_state == STATE_ACTIVE) deactivate();
+
+  if (m_is_active_flag && is_offscreen()) {
+    deactivate();
     set_state(STATE_INACTIVE);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,9 @@ BadGuy::update(float dt_sec)`
`173`	`173`	`return;`
`174`	`174`	`}`
`175`	`175`	`}`
`176`		`- if ((m_state != STATE_INACTIVE) && is_offscreen()) {`
`177`		`- if (m_state == STATE_ACTIVE) deactivate();`
	`176`	`+`
	`177`	`+ if (m_is_active_flag && is_offscreen()) {`
	`178`	`+ deactivate();`
`178`	`179`	`set_state(STATE_INACTIVE);`
`179`	`180`	`}`
`180`	`181`