mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-16 05:42:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a couple apparent typos. a) Don't pass ASCII string to Unicode function. b) If you type "(128 / 1000)" in C++, it will be treated as "0" because the integer division gets truncated. Fixed.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7318 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Nolan Check 2011-03-08 02:23:54 +00:00
parent e0df7d799a
commit a23fb0eef3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/CLRun/clrun/dynamiclib.c vendored
View File

@ -16,7 +16,7 @@ int loadLib(const char *filename) {
return -2; return -2;
#ifdef _WIN32 #ifdef _WIN32
library = LoadLibrary(filename); library = LoadLibraryA(filename);
#else #else
library = dlopen(filename, RTLD_NOW | RTLD_LOCAL); library = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
#endif #endif

10
Source/Core/Core/Src/HW/DVDInterface.cpp
View File

@ -30,11 +30,11 @@
#include "../VolumeHandler.h" #include "../VolumeHandler.h"
// Disc transfer rate measured in bytes per second // Disc transfer rate measured in bytes per second
#define DISC_TRANSFER_RATE_GC (3125 * 1024) static const u32 DISC_TRANSFER_RATE_GC = 3125 * 1024;
#define DISC_TRANSFER_RATE_WII (7926 * 1024) static const u32 DISC_TRANSFER_RATE_WII = 7926 * 1024;
// Disc access time measured in seconds // Disc access time measured in milliseconds
#define DISC_ACCESS_TIME (128 / 1000) static const u32 DISC_ACCESS_TIME_MS = 128;
namespace DVDInterface namespace DVDInterface
{ {
@ -466,7 +466,7 @@ void Write32(const u32 _iValue, const u32 _iAddress)
{ {
u64 ticksUntilTC = m_DILENGTH.Length * u64 ticksUntilTC = m_DILENGTH.Length *
(SystemTimers::GetTicksPerSecond() / (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii?DISC_TRANSFER_RATE_WII:DISC_TRANSFER_RATE_GC)) + (SystemTimers::GetTicksPerSecond() / (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii?DISC_TRANSFER_RATE_WII:DISC_TRANSFER_RATE_GC)) +
(SystemTimers::GetTicksPerSecond() * DISC_ACCESS_TIME); (SystemTimers::GetTicksPerSecond() * DISC_ACCESS_TIME_MS / 1000);
CoreTiming::ScheduleEvent((int)ticksUntilTC, tc); CoreTiming::ScheduleEvent((int)ticksUntilTC, tc);
} }
else else