diff --git a/core/Base/Time.cpp b/core/Base/Time.cpp index 5eb8e89c..2ae2181d 100644 --- a/core/Base/Time.cpp +++ b/core/Base/Time.cpp @@ -143,7 +143,7 @@ void e2d::Time::__updateLast() ::QueryPerformanceCounter(&s_tNow); s_nInterval = static_cast((s_tNow.QuadPart - s_tLastUpdate.QuadPart) * 1000LL / s_tFreq.QuadPart); - s_nTotalTime = static_cast(s_tNow.QuadPart - s_tStart.QuadPart) * 1000LL / s_tFreq.QuadPart; + s_nTotalTime = static_cast((s_tNow.QuadPart - s_tStart.QuadPart) * 1000LL / s_tFreq.QuadPart); } void e2d::Time::__sleep() diff --git a/core/Manager/MusicManager.cpp b/core/Manager/MusicManager.cpp index 4f6c6e76..404ae2f3 100644 --- a/core/Manager/MusicManager.cpp +++ b/core/Manager/MusicManager.cpp @@ -120,10 +120,10 @@ void e2d::MusicManager::stopAll() void e2d::MusicManager::__uninit() { - for (auto iter : GetMusicList()) + for (auto iter = GetMusicList().begin(); iter != GetMusicList().end(); iter++) { - iter.second->close(); - iter.second->release(); + (*iter).second->close(); + (*iter).second->release(); } GetMusicList().clear(); } diff --git a/project/vs2010/Easy2D.vcxproj b/project/vs2010/Easy2D.vcxproj index babf7272..58189b39 100644 --- a/project/vs2010/Easy2D.vcxproj +++ b/project/vs2010/Easy2D.vcxproj @@ -60,7 +60,6 @@ - @@ -73,9 +72,6 @@ - - - diff --git a/project/vs2010/Easy2D.vcxproj.filters b/project/vs2010/Easy2D.vcxproj.filters index 70a6f68f..26e49b3e 100644 --- a/project/vs2010/Easy2D.vcxproj.filters +++ b/project/vs2010/Easy2D.vcxproj.filters @@ -28,9 +28,6 @@ {fe2c1cba-f77d-4a33-bc8a-4f40ecd9d618} - - {72484ebf-d464-4f37-ad9b-340b378f9701} - {6f1847d1-aa22-4b3a-aeed-990b7645081f} @@ -114,9 +111,6 @@ Manager - - Manager - Node @@ -192,15 +186,6 @@ Node\Shape - - Tool\Listener - - - Tool\Listener - - - Tool\Listener - Common diff --git a/project/vs2012/Easy2D.vcxproj b/project/vs2012/Easy2D.vcxproj index 98cf1130..1f4d4f1a 100644 --- a/project/vs2012/Easy2D.vcxproj +++ b/project/vs2012/Easy2D.vcxproj @@ -60,7 +60,6 @@ - @@ -73,9 +72,6 @@ - - - diff --git a/project/vs2012/Easy2D.vcxproj.filters b/project/vs2012/Easy2D.vcxproj.filters index 26a0f207..4246a997 100644 --- a/project/vs2012/Easy2D.vcxproj.filters +++ b/project/vs2012/Easy2D.vcxproj.filters @@ -28,9 +28,6 @@ {f0ed2748-5199-48d1-930c-286afd27c235} - - {836e9902-e58c-4cfa-9c23-26632ae737ba} - {8ef0d8e2-1138-40c0-a1a8-0eb681721f4e} @@ -105,9 +102,6 @@ Manager - - Manager - Tool @@ -192,15 +186,6 @@ Manager - - Tool\Listener - - - Tool\Listener - - - Tool\Listener - Common diff --git a/project/vs2013/Easy2D.vcxproj b/project/vs2013/Easy2D.vcxproj index 01d966c3..ac6811b4 100644 --- a/project/vs2013/Easy2D.vcxproj +++ b/project/vs2013/Easy2D.vcxproj @@ -202,7 +202,6 @@ - @@ -215,9 +214,6 @@ - - - diff --git a/project/vs2013/Easy2D.vcxproj.filters b/project/vs2013/Easy2D.vcxproj.filters index e35e84b2..b89d51f7 100644 --- a/project/vs2013/Easy2D.vcxproj.filters +++ b/project/vs2013/Easy2D.vcxproj.filters @@ -28,9 +28,6 @@ {2092de23-7fdd-430a-9936-1038c55b504b} - - {8c3a8c7b-5406-400f-9ec1-db294632e449} - {7660a3fa-36f9-4b1b-8942-e38e02c0c95b} @@ -117,9 +114,6 @@ Manager - - Manager - Tool @@ -210,15 +204,6 @@ Manager - - Tool\Listener - - - Tool\Listener - - - Tool\Listener - Common