From e234125e06b49ae47c828095ebf15703e4a41c2d Mon Sep 17 00:00:00 2001
From: Xadhoom <>
Date: Sat, 16 Mar 2019 14:48:12 +0000
Subject: [PATCH] Fix merge

---
 CMakeLists.txt    | 2 +-
 SourceX/storm.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cce33dbb..ca069e1b2 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/SourceX/storm.cpp b/SourceX/storm.cpp
index 13428c635..b1b38edb6 100644
--- a/SourceX/storm.cpp
+++ b/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)