Skip to content
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.

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

Fix game_mode and game_type enums #687

Merged
merged 1 commit into from
Dec 10, 2023
Merged

Fix game_mode and game_type enums #687

merged 1 commit into from
Dec 10, 2023

Conversation

Bumber64
Copy link
Contributor

Fix game_mode and game_type enums by removing num value and setting NONE to -1.

@myk002 myk002 merged commit 35c15d5 into DFHack:master Dec 10, 2023
17 checks passed
@quietust
Copy link
Member

quietust commented Dec 12, 2024

This change was incorrect - as the enums are defined in Toady's headers, the NONE entries are NOT set to -1!

enum GameMode
{
	GAMEMODE_DWARF,
	GAMEMODE_ADVENTURE,
	GAMEMODENUM,
	GAMEMODE_NONE
};

enum GameType
{
	GAMETYPE_DWARF_MAIN,
	GAMETYPE_ADVENTURE_MAIN,
	GAMETYPE_VIEW_LEGENDS,
	GAMETYPE_DWARF_RECLAIM,
	GAMETYPE_DWARF_ARENA,
	GAMETYPE_ADVENTURE_ARENA,
	GAMETYPE_ADVENTURE_DUNGEON,
	GAMETYPE_DWARF_TUTORIAL,
	GAMETYPE_DWARF_UNRETIRE,
	GAMETYPE_ADVENTURE_WORLD_DEBUG,
	GAMETYPENUM,
	GAMETYPE_NONE
};

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants