Browse Source

Fix MSVC SDL1 warnings

pull/6882/head
obligaron 2 years ago committed by Anders Jenbo
parent
commit
bd3d17975c
  1. 4
      Source/engine/assets.hpp
  2. 8
      Source/interfac.cpp
  3. 12
      Source/interfac.h
  4. 4
      Source/pfile.cpp

4
Source/engine/assets.hpp

@ -192,7 +192,11 @@ struct AssetHandle {
bool read(void *buffer, size_t len)
{
#if SDL_VERSION_ATLEAST(2, 0, 0)
return handle->read(handle, buffer, len, 1) == 1;
#else
return handle->read(handle, buffer, static_cast<int>(len), 1) == 1;
#endif
}
bool seek(long pos)

8
Source/interfac.cpp

@ -46,7 +46,7 @@ const int BarPos[3][2] = { { 53, 37 }, { 53, 421 }, { 53, 37 } };
OptionalOwnedClxSpriteList ArtCutsceneWidescreen;
uint16_t CustomEventsBegin = SDL_USEREVENT;
SdlEventType CustomEventsBegin = SDL_USEREVENT;
constexpr uint16_t NumCustomEvents = WM_LAST - WM_FIRST + 1;
Cutscenes GetCutSceneFromLevelType(dungeon_type type)
@ -234,17 +234,17 @@ void RegisterCustomEvents()
#endif
}
bool IsCustomEvent(uint16_t eventType)
bool IsCustomEvent(SdlEventType eventType)
{
return eventType >= CustomEventsBegin && eventType < CustomEventsBegin + NumCustomEvents;
}
interface_mode GetCustomEvent(uint16_t eventType)
interface_mode GetCustomEvent(SdlEventType eventType)
{
return static_cast<interface_mode>(eventType - CustomEventsBegin);
}
uint16_t CustomEventToSdlEvent(interface_mode eventType)
SdlEventType CustomEventToSdlEvent(interface_mode eventType)
{
return CustomEventsBegin + eventType;
}

12
Source/interfac.h

@ -32,11 +32,17 @@ enum interface_mode : uint8_t {
void RegisterCustomEvents();
bool IsCustomEvent(uint16_t eventType);
#if SDL_VERSION_ATLEAST(2, 0, 0)
using SdlEventType = uint16_t;
#else
using SdlEventType = uint8_t;
#endif
interface_mode GetCustomEvent(uint16_t eventType);
bool IsCustomEvent(SdlEventType eventType);
uint16_t CustomEventToSdlEvent(interface_mode eventType);
interface_mode GetCustomEvent(SdlEventType eventType);
SdlEventType CustomEventToSdlEvent(interface_mode eventType);
enum Cutscenes : uint8_t {
CutStart,

4
Source/pfile.cpp

@ -286,7 +286,11 @@ void CreateDetailDiffs(std::string_view prefix, std::string_view memoryMapFile,
size_t readBytes = static_cast<size_t>(SDL_RWsize(handle));
std::unique_ptr<std::byte[]> memoryMapFileData { new std::byte[readBytes] };
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_RWread(handle, memoryMapFileData.get(), readBytes, 1);
#else
SDL_RWread(handle, memoryMapFileData.get(), static_cast<int>(readBytes), 1);
#endif
SDL_RWclose(handle);
const std::string_view buffer(reinterpret_cast<const char *>(memoryMapFileData.get()), readBytes);

Loading…
Cancel
Save