diff --git a/Core/CwCheat.h b/Core/CwCheat.h index 3500134173..bd6a4b951e 100644 --- a/Core/CwCheat.h +++ b/Core/CwCheat.h @@ -36,7 +36,7 @@ private: bool cheatsOn; std::vector codes; - int currentCode; + size_t currentCode; bool exit2; std::vector parts; }; diff --git a/Core/HLE/__sceAudio.cpp b/Core/HLE/__sceAudio.cpp index d6a0f54222..68ec149618 100644 --- a/Core/HLE/__sceAudio.cpp +++ b/Core/HLE/__sceAudio.cpp @@ -122,7 +122,7 @@ u32 __AudioEnqueue(AudioChannel &chan, int chanNum, bool blocking) if (chan.sampleQueue.size() > chan.sampleCount * 2 * chanQueueMaxSizeFactor || chan.sampleAddress == 0) { if (blocking) { // TODO: Regular multichannel audio seems to block for 64 samples less? Or enqueue the first 64 sync? - int blockSamples = chan.sampleQueue.size() / 2 / chanQueueMinSizeFactor; + int blockSamples = (int)chan.sampleQueue.size() / 2 / chanQueueMinSizeFactor; AudioChannelWaitInfo waitInfo = {__KernelGetCurThread(), blockSamples}; chan.waitingThreads.push_back(waitInfo); diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index a7ef283b81..14f0eac345 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -554,7 +554,7 @@ u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishF int gotsize = atrac->sampleQueue.pop_front(buf, ATRAC_MAX_SAMPLES * sizeof(s16) * atrac->atracChannels); numSamples = gotsize / sizeof(s16) / atrac->atracChannels; s16* in = (s16*)buf; - for (int i = 0; i < numSamples; i++) { + for (u32 i = 0; i < numSamples; i++) { s16 sampleL = *in++; s16 sampleR = sampleL; if (atrac->atracChannels == 2) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 14a794b079..5ca843cff2 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -202,7 +202,7 @@ namespace MainWindow void setFpsLimit(int fps) { g_Config.iFpsLimit = fps; } - void enableCheats(int cheats){ + void enableCheats(bool cheats){ g_Config.bEnableCheats = cheats; }