Fix merge

CMakeLists.txt

@@ -235,7 +235,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 endif()
 # Warnings for devilutionX
 target_compile_options(devilution PUBLIC -Wno-unknown-pragmas)
-target_compile_options(devilutionx PRIVATE -fpermissive -Wall -Wextra -Wno-multichar -Wno-unused-parameter)
+target_compile_options(devilutionx PRIVATE -Wall -Wextra -Wno-multichar -Wno-unused-parameter)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   # Style issues

SourceX/storm.cpp

@@ -35,7 +35,7 @@ BOOL SFileDdaBeginEx(HANDLE directsound, DWORD flags, DWORD mask, unsigned __int
     signed __int32 volume, signed int pan, int a7)
 {
 	DWORD bytestoread = SFileGetFileSize(directsound, 0);
-	char *SFXbuffer = malloc(bytestoread);
+	char *SFXbuffer = (char*)malloc(bytestoread);
 	SFileReadFile(directsound, SFXbuffer, bytestoread, NULL, 0);
 
 	SDL_RWops *rw = SDL_RWFromConstMem(SFXbuffer, bytestoread);
@@ -44,14 +44,14 @@ BOOL SFileDdaBeginEx(HANDLE directsound, DWORD flags, DWORD mask, unsigned __int
 
 	Mix_PlayChannel(0, SFileChunk, 0);
 
-	return TRUE;
+	return true;
 }
 
 BOOL SFileDdaDestroy()
 {
 	Mix_FreeChunk(SFileChunk);
 
-	return TRUE;
+	return true;
 }
 
 BOOL SFileDdaEnd(HANDLE directsound)
@@ -68,7 +68,7 @@ BOOL SFileDdaGetPos(HANDLE directsound, int *current, int *end)
 		*current = *end;
 	}
 
-	return TRUE;
+	return true;
 }
 
 BOOL SFileDdaInitialize(HANDLE directsound)