Skip to content

Commit dab5b00

Browse files
committed
This is vAmiga v3.0b2
1 parent f5c1d71 commit dab5b00

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

Emulator/Components/CIA/CIA.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,12 @@ CIA::cacheStats(CIAStats &result) const
182182
{
183183
{ SYNCHRONIZED
184184

185-
result.idleSince = idleSince();
186-
result.idleTotal = idleTotal() + result.idleSince;
187-
result.idlePercentage = clock ? (double)result.idleTotal / (double)clock : 100.0;
185+
auto idle = idleSince();
186+
auto total = idleTotal() + idle;
187+
188+
result.idleSince = idle;
189+
result.idleTotal = total;
190+
result.idlePercentage = clock ? double(total) / double(clock + idle) : 100.0;
188191
}
189192
}
190193

Emulator/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
#define VER_MAJOR 3
1818
#define VER_MINOR 0
1919
#define VER_SUBMINOR 0
20-
#define VER_BETA 1
20+
#define VER_BETA 2
2121

2222
// Snapshot version number
2323
#define SNP_MAJOR 3
2424
#define SNP_MINOR 0
2525
#define SNP_SUBMINOR 0
26-
#define SNP_BETA 1
26+
#define SNP_BETA 2
2727

2828
// Uncomment this setting in a release build
2929
// #define RELEASEBUILD

vAmiga.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2868,7 +2868,7 @@
28682868
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
28692869
CODE_SIGN_STYLE = Manual;
28702870
COMBINE_HIDPI_IMAGES = YES;
2871-
CURRENT_PROJECT_VERSION = 240915;
2871+
CURRENT_PROJECT_VERSION = 240920;
28722872
DEAD_CODE_STRIPPING = YES;
28732873
DEVELOPMENT_TEAM = "";
28742874
ENABLE_APP_SANDBOX = NO;
@@ -2889,7 +2889,7 @@
28892889
"@executable_path/../Frameworks",
28902890
);
28912891
MACOSX_DEPLOYMENT_TARGET = 11.0;
2892-
MARKETING_VERSION = 3.0b1;
2892+
MARKETING_VERSION = 3.0b2;
28932893
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
28942894
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
28952895
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2919,7 +2919,7 @@
29192919
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
29202920
CODE_SIGN_STYLE = Manual;
29212921
COMBINE_HIDPI_IMAGES = YES;
2922-
CURRENT_PROJECT_VERSION = 240915;
2922+
CURRENT_PROJECT_VERSION = 240920;
29232923
DEAD_CODE_STRIPPING = YES;
29242924
DEVELOPMENT_TEAM = "";
29252925
ENABLE_APP_SANDBOX = NO;
@@ -2938,7 +2938,7 @@
29382938
);
29392939
LLVM_LTO = YES_THIN;
29402940
MACOSX_DEPLOYMENT_TARGET = 11.0;
2941-
MARKETING_VERSION = 3.0b1;
2941+
MARKETING_VERSION = 3.0b2;
29422942
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
29432943
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
29442944
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)