Skip to content

sync: merge SFTtech/openage master - #2

Merged
OpenGamePlus merged 8 commits into
masterfrom
sync/upstream
Nov 15, 2026
Merged

OpenGamePlus merged 8 commits into
masterfrom
sync/upstream

Conversation

@OpenGamePlus

Copy link
Copy Markdown
Owner

Automated sync with upstream SFTtech/openage master.

JotaJazz and others added 8 commits November 11, 2026 22:14
Since Python fslike paths are stored as str, the C++ callbacks still
passed subpaths as bytes and read Directory.path and native paths with
bytes(). Lookups in a Union never matched, so the engine could not find
assets/converted and the game did not start.

Let Cython convert std::string to and from str (UTF-8) in the fslike
bridge, and read Python strings with str() in C++.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The presenter attaches its renderer in its own thread, which can happen
before GameSimulation::start() has created the game, because creating
it loads all nyan data. That dereferenced a null game and crashed.

Store the render factory and attach it to the game in start() if the
game didn't exist yet.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Fix game startup: fslike str paths across C++/Python and renderer attach race
The Grid constructor taking existing sectors moved the vector into the
member and then read the sector size from the moved-from parameter,
so it always threw std::out_of_range.

Fixes SFTtech#1828

Co-Authored-By: Claude Opus 5.5 <[email protected]>
pop() locked the recursive mutex and then waited in front(), which
locked it a second time. The wait only releases one lock level, so the
mutex stayed held, push() could never add an element and pop() on an
empty queue deadlocked. pop() now waits itself, holding only one lock.

Fixes SFTtech#1826

Co-Authored-By: Claude Opus 5.5 <[email protected]>
…sectors

pathfinding: read sector size from the moved sectors in Grid
…t-queue-pop

datastructure: let ConcurrentQueue::pop() wait with a single lock
@OpenGamePlus
OpenGamePlus merged commit 6be22f1 into master Nov 15, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants