diff --git a/JGE/src/SDLmain.cpp b/JGE/src/SDLmain.cpp index 6803ceb72..ec9732666 100644 --- a/JGE/src/SDLmain.cpp +++ b/JGE/src/SDLmain.cpp @@ -88,22 +88,22 @@ class SdlApp { if ((GLfloat)width / (GLfloat)height <= ACTUAL_RATIO) { viewPort.x = 0; - viewPort.y = -((width/ACTUAL_RATIO)-height)/2; + viewPort.y = -(static_cast(width / ACTUAL_RATIO) - height) / 2; viewPort.w = width; - viewPort.h = width / ACTUAL_RATIO; + viewPort.h = static_cast(width / ACTUAL_RATIO); } else { - viewPort.x = -(height*ACTUAL_RATIO-width)/2; + viewPort.x = -(static_cast(height * ACTUAL_RATIO) - width) / 2; viewPort.y = 0; - viewPort.w = height * ACTUAL_RATIO; + viewPort.w = static_cast(height * ACTUAL_RATIO); viewPort.h = height; } glViewport(viewPort.x, viewPort.y, viewPort.w, viewPort.h); - JRenderer::GetInstance()->SetActualWidth(viewPort.w); - JRenderer::GetInstance()->SetActualHeight(viewPort.h); + JRenderer::GetInstance()->SetActualWidth(static_cast(viewPort.w)); + JRenderer::GetInstance()->SetActualHeight(static_cast(viewPort.h)); glScissor(0, 0, width, height); #if (!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0) @@ -331,11 +331,10 @@ void DestroyGame(void) g_engine = NULL; } -void SdlApp::OnUpdate() { - static int tickCount; - Uint32 dt; - tickCount = JGEGetTime(); - dt = (tickCount - lastTickCount); +void SdlApp::OnUpdate() +{ + static int tickCount = JGEGetTime(); + int64_t dt = (tickCount - lastTickCount); lastTickCount = tickCount; if(g_engine->IsDone()) { diff --git a/JGE/src/pc/JSfx.cpp b/JGE/src/pc/JSfx.cpp index 38b4799a1..46f148d03 100644 --- a/JGE/src/pc/JSfx.cpp +++ b/JGE/src/pc/JSfx.cpp @@ -32,7 +32,7 @@ void JMusic::Update(){ int JMusic::getPlayTime(){ #ifdef WITH_FMOD - return FSOUND_GetCurrentPosition(JSoundSystem::GetInstance()->mChannel)/44.1; //todo more generic, here it's only 44kHz + return static_cast(FSOUND_GetCurrentPosition(JSoundSystem::GetInstance()->mChannel) / 44.1); //todo more generic, here it's only 44kHz #else return 0; #endif @@ -238,7 +238,7 @@ void JSoundSystem::SetVolume(int volume) void JSoundSystem::SetMusicVolume(int volume) { #ifdef WITH_FMOD - if (mChannel != FSOUND_FREE) FSOUND_SetVolumeAbsolute(mChannel,volume * 2.55); + if (mChannel != FSOUND_FREE) FSOUND_SetVolumeAbsolute(mChannel, static_cast(volume * 2.55)); #endif mVolume = volume; } @@ -247,7 +247,7 @@ void JSoundSystem::SetSfxVolume(int volume){ //this sets the volume to all channels then reverts back the volume for music.. //that's a bit dirty but it works #ifdef WITH_FMOD - FSOUND_SetVolumeAbsolute(FSOUND_ALL, volume * 2.55); + FSOUND_SetVolumeAbsolute(FSOUND_ALL, static_cast(volume * 2.55)); #endif mSampleVolume = volume; SetMusicVolume(mVolume); @@ -305,7 +305,7 @@ void JSoundSystem::PlaySample(JSample *sample) #ifdef WITH_FMOD if (sample && sample->mSample){ int channel = FSOUND_PlaySound(FSOUND_FREE, sample->mSample); - FSOUND_SetVolumeAbsolute(channel,mSampleVolume * 2.55); + FSOUND_SetVolumeAbsolute(channel, static_cast(mSampleVolume * 2.55)); } #endif #endif diff --git a/projects/mtg/include/utils.h b/projects/mtg/include/utils.h index 71b3b3976..5d67ef3b6 100644 --- a/projects/mtg/include/utils.h +++ b/projects/mtg/include/utils.h @@ -126,7 +126,7 @@ u32 ramAvailable(void); #ifdef WIN32 #include -#define MAKEDIR(name) mkdir(name) +#define MAKEDIR(name) _mkdir(name) #else #include #define MAKEDIR(name) mkdir(name, 0777)