Skip to content

Fix crash (0xC0000005) when a NULL city pointer is passed to City_has_improvement #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orcutt989 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix crash (0xC0000005) when a NULL city pointer is passed to City_has_improvement #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- Fix some ways areas revealed by recon can stay permanently revealed
- Can happen when the unit that performed recon was destroyed before the start of its next turn (this is a base game bug)
- Can happen when a unit has performed multiple recon missions in one turn (possible if charge_one_move_for_recon_and_interception option is active)
- Fix crash (0xC0000005) when a NULL city pointer is passed to City_has_improvement

* RELEASE 28 PREVIEW 1
- Allow for custom combat bonuses or maluses to be applied based on unit type, combat role (attack, defense, or bombard), terrain, city/district, and experience level
Expand Down
3 changes: 3 additions & 0 deletions injected_code.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16288,6 +16288,9 @@ show_map_specific_text (int tile_x, int tile_y, char const * text, bool pause)
bool __fastcall
patch_City_has_improvement (City * this, int edx, int improv_id, bool include_auto_improvements)
{
if (this == NULL)
return false;

bool tr = City_has_improvement (this, __, improv_id, include_auto_improvements);

// Check if the improvement is provided for free by another human player's wonder if we're in a hotseat game and the config option is on
Expand Down