ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: Fix some compiler warnings.

This commit is contained in:
rogerman 2023-06-14 13:57:30 -07:00
parent 7c2f281d25
commit 5c805b2de0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/frontend/cocoa/cocoa_firmware.mm
View File

@ -1,6 +1,6 @@
/* /*
Copyright (C) 2011 Roger Manuel Copyright (C) 2011 Roger Manuel
Copyright (C) 2012-2022 DeSmuME team Copyright (C) 2012-2023 DeSmuME team
This file is free software: you can redistribute it and/or modify This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -990,7 +990,7 @@ FirmwareConfigInterface::FirmwareConfigInterface()
_internalData = (FirmwareConfig *)malloc(sizeof(FirmwareConfig)); _internalData = (FirmwareConfig *)malloc(sizeof(FirmwareConfig));
NDS_GetDefaultFirmwareConfig(*_internalData); NDS_GetDefaultFirmwareConfig(*_internalData);
srand(time(NULL)); srand((uint32_t)time(NULL));
// Generate a random firmware MAC address and its associated string. // Generate a random firmware MAC address and its associated string.
const uint32_t defaultFirmwareMACAddressValue = (uint32_t)_internalData->MACAddress[2] | ((uint32_t)_internalData->MACAddress[3] << 8) | ((uint32_t)_internalData->MACAddress[4] << 16) | ((uint32_t)_internalData->MACAddress[5] << 24); const uint32_t defaultFirmwareMACAddressValue = (uint32_t)_internalData->MACAddress[2] | ((uint32_t)_internalData->MACAddress[3] << 8) | ((uint32_t)_internalData->MACAddress[4] << 16) | ((uint32_t)_internalData->MACAddress[5] << 24);

8
desmume/src/frontend/cocoa/openemu/NDSGameCore.mm
View File

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2012-2022 DeSmuME team Copyright (C) 2012-2023 DeSmuME team
This file is free software: you can redistribute it and/or modify This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -509,7 +509,7 @@ void UpdateDisplayPropertiesFromStates(uint64_t displayModeStates, ClientDisplay
// draw at 1x scaling, which starts looking uglier as the view size is increased. // draw at 1x scaling, which starts looking uglier as the view size is increased.
if (!_canRespondToViewResize) if (!_canRespondToViewResize)
{ {
int legacyVersionScale = 1; NSUInteger legacyVersionScale = 1;
_OEViewSize.width = (int)(transformNormalWidth + 0.0005); _OEViewSize.width = (int)(transformNormalWidth + 0.0005);
_OEViewSize.height = (int)(transformNormalHeight + 0.0005); _OEViewSize.height = (int)(transformNormalHeight + 0.0005);
@ -535,8 +535,8 @@ void UpdateDisplayPropertiesFromStates(uint64_t displayModeStates, ClientDisplay
} }
// Multiply the normal size by our fixed scaling value. // Multiply the normal size by our fixed scaling value.
_OEViewSize.width *= legacyVersionScale; _OEViewSize.width *= (int)legacyVersionScale;
_OEViewSize.height *= legacyVersionScale; _OEViewSize.height *= (int)legacyVersionScale;
} }
apple_unfairlock_lock(unfairlockDisplayMode); apple_unfairlock_lock(unfairlockDisplayMode);