Skip to content

[pull] master from ladislav-zezula:master #72

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
pull merged 5 commits into from
Nov 24, 2025
Merged

[pull] master from ladislav-zezula:master #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89a364c
silence -Wswitch-enum
divinity76 Nov 24, 2025
897366f
stricter silence
divinity76 Nov 24, 2025
87474f5
Got rid of '#define bool char'
ladislav-zezula Nov 24, 2025
d6f6645
Merge pull request #405 from divinity76/patch-2
ladislav-zezula Nov 24, 2025
6a18fa7
#included stdbool.h when necessary
ladislav-zezula Nov 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: 6 additions & 0 deletions src/SFileOpenArchive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,12 @@ bool WINAPI SFileOpenArchive(
ha->dwValidFileFlags = MPQ_FILE_VALID_FLAGS_W3X;
ha->dwFlags |= MPQ_FLAG_WAR3_MAP;
break;
case MapTypeNotChecked:
case MapTypeNotRecognized:
case MapTypeAviFile:
case MapTypeStarcraft2:
// silence -Wswitch-enum
break;
}

// Set the size of file sector. Be sure to check for integer overflow
Expand Down
6 changes: 2 additions & 4 deletions src/StormPort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@
#ifndef __STORMPORT_H__
#define __STORMPORT_H__

#ifndef __cplusplus
#define bool char
#define true 1
#define false 0
#if !defined(__cplusplus) && !defined(_MSC_VER)
#include <stdbool.h>
#endif

//-----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions test/StormTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3955,7 +3955,7 @@ static DWORD TestUtf8Conversions(const BYTE * szTestString, const TCHAR * szList

static void Test_PlayingSpace()
{

/*
HANDLE hMpq;
HANDLE hFile;
LPBYTE pbData;
Expand All @@ -3975,7 +3975,7 @@ static void Test_PlayingSpace()
}
SFileCloseArchive(hMpq);
}

*/
}

//-----------------------------------------------------------------------------
Expand Down