krzosa/corelang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTS: Simulating entire path always, fix bug one off goal

Browse Source
This commit is contained in:
Krzosa Karol
2023-04-20 15:29:15 +02:00
parent a728f5c37f
commit 1aed323783
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/rtsgame/map.core
View File

@@ -138,7 +138,6 @@ MAP_RecomputeHistory :: (s: *MAP_Actor)
Reset(&s.history) Reset(&s.history)
it := GetLast(&s.close_paths) it := GetLast(&s.close_paths)
Add(&s.history, *it) Add(&s.history, *it)
Pop(&s.history)
for i := 0,,i += 1 for i := 0,,i += 1
if it.p.x == s.p.x && it.p.y == s.p.y ;; break if it.p.x == s.p.x && it.p.y == s.p.y ;; break
if i > 512 if i > 512
@@ -172,7 +171,9 @@ MAP_PathFindUpdate :: (map: *MAP_Map)
Reset(&s.history) Reset(&s.history)
break break
MAP_PathFindStep :: (s: *MAP_Actor) MAP_PathFind(s)
MAP_PathFindStep :: (s: *MAP_Actor, compute_history: bool = true): bool
if s.open_paths.len == 0 if s.open_paths.len == 0
// Reset if we didnt find solution // Reset if we didnt find solution
if s.close_paths.len != 0 if s.close_paths.len != 0
@@ -189,7 +190,7 @@ MAP_PathFindStep :: (s: *MAP_Actor)
last := GetLast(&s.close_paths) last := GetLast(&s.close_paths)
reached_target := last.p.x == s.target_p.x && last.p.y == s.target_p.y reached_target := last.p.x == s.target_p.x && last.p.y == s.target_p.y
if reached_target if reached_target
return return true
it := Pop(&s.open_paths) it := Pop(&s.open_paths)
Add(&s.close_paths, it) Add(&s.close_paths, it)
@@ -204,4 +205,11 @@ MAP_PathFindStep :: (s: *MAP_Actor)
p := V2I{it.p.x + x, it.p.y + y} p := V2I{it.p.x + x, it.p.y + y}
MAP_InsertOpenPath(s, p, it.p) MAP_InsertOpenPath(s, p, it.p)
if compute_history ;; MAP_RecomputeHistory(s)
return false
MAP_PathFind :: (s: *MAP_Actor)
for i := 0, i < 128, i += 1
done := MAP_PathFindStep(s, false)
if done ;; break
MAP_RecomputeHistory(s) MAP_RecomputeHistory(s)