mirror of
https://github.com/kichikuou/system3-sdl2.git
synced 2026-10-13 09:48:15 +03:00
Fix warnings in MSVS build
This commit is contained in:
@@ -54,7 +54,7 @@ void AGS::draw_text(const char* string, bool text_wait)
|
||||
// 文字コード取得
|
||||
uint8 c = (uint8)string[p++];
|
||||
uint16 code = c;
|
||||
if(is_2byte_message(code)) {
|
||||
if(is_2byte_message(c)) {
|
||||
code = (code << 8) | (uint8)string[p++];
|
||||
}
|
||||
if(draw_hankaku) {
|
||||
|
||||
@@ -44,8 +44,8 @@ const uint8 smf_header[] = {
|
||||
};
|
||||
const size_t TRACK_LENGTH_OFFSET = 18;
|
||||
|
||||
const size_t FADEOUT_DURATION = 100; // 1 second
|
||||
const size_t MINIMUM_MUSIC_DURATION = 6000; // 60 seconds
|
||||
const int FADEOUT_DURATION = 100; // 1 second
|
||||
const int MINIMUM_MUSIC_DURATION = 6000; // 60 seconds
|
||||
|
||||
class SmfWriter {
|
||||
public:
|
||||
@@ -64,7 +64,7 @@ public:
|
||||
buf.push_back(0x00);
|
||||
|
||||
size_t length = buf.size() - (TRACK_LENGTH_OFFSET + 4);
|
||||
buf[TRACK_LENGTH_OFFSET] = length >> 24;
|
||||
buf[TRACK_LENGTH_OFFSET] = length >> 24 & 0xff;
|
||||
buf[TRACK_LENGTH_OFFSET + 1] = length >> 16 & 0xff;
|
||||
buf[TRACK_LENGTH_OFFSET + 2] = length >> 8 & 0xff;
|
||||
buf[TRACK_LENGTH_OFFSET + 3] = length & 0xff;
|
||||
@@ -133,7 +133,7 @@ private:
|
||||
dt = 0;
|
||||
}
|
||||
|
||||
uint8 fade(uint8 level) {
|
||||
int fade(int level) {
|
||||
if (fadeout_start < 0)
|
||||
return level;
|
||||
return level * (fadeout_start + FADEOUT_DURATION - total_ticks) / FADEOUT_DURATION;
|
||||
@@ -565,10 +565,7 @@ void MAKOMidi::load_mda(int page)
|
||||
// MDAデータの読み込み
|
||||
char path[16];
|
||||
strcpy_s(path, 16, amus);
|
||||
int p = strlen(path);
|
||||
path[p - 3] = 'M';
|
||||
path[p - 2] = 'D';
|
||||
path[p - 1] = 'A';
|
||||
strcpy(path + strlen(path) - 3, "MDA");
|
||||
|
||||
DRI* dri = new DRI();
|
||||
int size;
|
||||
|
||||
+1
-1
@@ -302,7 +302,7 @@ void NACT::message()
|
||||
else
|
||||
break;
|
||||
}
|
||||
int len = end - begin;
|
||||
int len = static_cast<int>(end - begin);
|
||||
scenario_addr += len;
|
||||
|
||||
char* buf = (char*)alloca(len + 1);
|
||||
|
||||
@@ -35,8 +35,8 @@ void NACT::pump_events()
|
||||
case SDL_FINGERDOWN:
|
||||
case SDL_FINGERUP:
|
||||
case SDL_FINGERMOTION:
|
||||
mousex = e.tfinger.x * 640;
|
||||
mousey = e.tfinger.y * ags->screen_height;
|
||||
mousex = static_cast<int>(e.tfinger.x) * 640;
|
||||
mousey = static_cast<int>(e.tfinger.y) * ags->screen_height;
|
||||
fingers = SDL_GetNumTouchFingers(e.tfinger.touchId);
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user