Skip to content

Fix debug config #507

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

Merged
Asdow merged 2 commits into from
Sep 24, 2025
Merged

Fix debug config #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61dd7d0
Fix debug mode defines
Asdow Sep 24, 2025
d61c8b3
Fix Debug build
Asdow Sep 24, 2025
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
6 changes: 3 additions & 3 deletions Ja2/builddefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
// -----------------------------

// Map Editor version - you should use the MapEditor configuration instead of messing with these defines (ChrisL)
#ifndef JA2BETAVERSION
#define JA2BETAVERSION
#endif
//#ifndef JA2BETAVERSION
//#define JA2BETAVERSION
//#endif
//#define JA2EDITOR
// Normal test version
//#define JA2TESTVERSION
Expand Down
2 changes: 1 addition & 1 deletion Tactical/ShopKeeper Interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6665,7 +6665,7 @@ void AddShopkeeperToGridNo( UINT8 ubProfile, INT32 sGridNo )
{
SOLDIERCREATE_STRUCT MercCreateStruct;
INT16 sSectorX, sSectorY;
UINT16 ubID;
SoldierID ubID;

GetCurrentWorldSector( &sSectorX, &sSectorY );

Expand Down
Loading