Merge fix

This commit is contained in:
KimLS
2018-11-11 01:05:44 -08:00
17 changed files with 754 additions and 415 deletions
+2 -1
View File
@@ -379,8 +379,9 @@ Mob::Mob(const char* in_name,
m_CurrentWayPoint = glm::vec4();
cur_wp_pause = 0;
patrol = 0;
follow = 0;
follow_id = 0;
follow_dist = 100; // Default Distance for Follow
follow_run = true; // We can run if distance great enough
no_target_hotkey = false;
flee_mode = false;
currently_fleeing = false;