From 1d3715580b7520c91e526ae908bd6ed322112311 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sat, 2 Jan 2021 13:22:36 +0900 Subject: [PATCH] MSVS build: Suppress warning C4244 (possible loss of data) VC++ is picky about narrowing conversion. Let's ignore it instead of scattering static_casts. --- src/CMakeLists.txt | 2 +- src/fm/makofm.cpp | 2 +- src/sys/nact.cpp | 2 +- src/sys/nact_input.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f4a2520..85c537c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,7 +88,7 @@ else() # NOT (ANDROID OR EMSCRIPTEN) ) target_compile_definitions(system3 PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS) - target_compile_options(system3 PRIVATE /utf-8) + target_compile_options(system3 PRIVATE /utf-8 /wd4244) target_link_libraries(system3 PRIVATE SDL2 SDL2TTF) set_target_properties(system3 PROPERTIES VS_DEBUGGER_ENVIRONMENT "PATH=${SDL2_LIB_DIR}$${SDL2TTF_LIB_DIR}$$ENV{PATH}") diff --git a/src/fm/makofm.cpp b/src/fm/makofm.cpp index aee3708..c6174c5 100644 --- a/src/fm/makofm.cpp +++ b/src/fm/makofm.cpp @@ -130,7 +130,7 @@ void MakoFM::ExecSequence(int ch, bool execcmd) { execcmd: cmdFF = 0; - work[ch].seq_ptr = static_cast(ExecCmd(ch, data + work[ch].seq_ptr) - data); + work[ch].seq_ptr = ExecCmd(ch, data + work[ch].seq_ptr) - data; if (cmdFF) { uint16_t block_addr = GetWord(work[ch].jump_ptr); work[ch].jump_ptr += 2; diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp index bbf7b48..62b07d2 100644 --- a/src/sys/nact.cpp +++ b/src/sys/nact.cpp @@ -302,7 +302,7 @@ void NACT::message() else break; } - int len = static_cast(end - begin); + int len = end - begin; scenario_addr += len; char* buf = (char*)alloca(len + 1); diff --git a/src/sys/nact_input.cpp b/src/sys/nact_input.cpp index 67fc89f..ed874b7 100644 --- a/src/sys/nact_input.cpp +++ b/src/sys/nact_input.cpp @@ -35,8 +35,8 @@ void NACT::pump_events() case SDL_FINGERDOWN: case SDL_FINGERUP: case SDL_FINGERMOTION: - mousex = static_cast(e.tfinger.x) * 640; - mousey = static_cast(e.tfinger.y) * ags->screen_height; + mousex = e.tfinger.x * 640; + mousey = e.tfinger.y * ags->screen_height; fingers = SDL_GetNumTouchFingers(e.tfinger.touchId); break;