[Scummvm-git-logs] scummvm master -> 774020f737f30137edf1878a82b7849be5fd3974

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
774020f737 JANITORIAL: ULTIMA: make some constants constexpr


Commit: 774020f737f30137edf1878a82b7849be5fd3974
    https://github.com/scummvm/scummvm/commit/774020f737f30137edf1878a82b7849be5fd3974
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-02-05T00:22:28+02:00

Commit Message:
JANITORIAL: ULTIMA: make some constants constexpr

Changed paths:
    engines/ultima/ultima8/gumps/bark_gump.cpp
    engines/ultima/ultima8/kernel/kernel.cpp
    engines/ultima/ultima8/kernel/kernel.h


diff --git a/engines/ultima/ultima8/gumps/bark_gump.cpp b/engines/ultima/ultima8/gumps/bark_gump.cpp
index 1aecc8a92a1..72b67fa8045 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.cpp
+++ b/engines/ultima/ultima8/gumps/bark_gump.cpp
@@ -32,9 +32,9 @@
 namespace Ultima {
 namespace Ultima8 {
 
-static const int INT_MAX_VALUE = 0x7fffffff;
-static const int NO_SPEECH_LENGTH = 480;
-static const int MILLIS_PER_TICK = (1000 / Kernel::TICKS_PER_SECOND) + 1;
+static constexpr int INT_MAX_VALUE = 0x7fffffff;
+static constexpr int NO_SPEECH_LENGTH = 480;
+static constexpr int MILLIS_PER_TICK = (1000 / Kernel::TICKS_PER_SECOND) + 1;
 
 DEFINE_RUNTIME_CLASSTYPE_CODE(BarkGump) 
 
diff --git a/engines/ultima/ultima8/kernel/kernel.cpp b/engines/ultima/ultima8/kernel/kernel.cpp
index 4f4d22423d0..e7073b5534a 100644
--- a/engines/ultima/ultima8/kernel/kernel.cpp
+++ b/engines/ultima/ultima8/kernel/kernel.cpp
@@ -31,10 +31,6 @@ namespace Ultima8 {
 
 Kernel *Kernel::_kernel = nullptr;
 
-const uint32 Kernel::TICKS_PER_FRAME = 2;
-const uint32 Kernel::TICKS_PER_SECOND = 60;
-const uint32 Kernel::FRAMES_PER_SECOND = Kernel::TICKS_PER_SECOND / Kernel::TICKS_PER_FRAME;
-
 // A special proc type which means "all"
 const uint16 Kernel::PROC_TYPE_ALL = 6;
 
diff --git a/engines/ultima/ultima8/kernel/kernel.h b/engines/ultima/ultima8/kernel/kernel.h
index 508844dfc08..4cae15ad4ba 100644
--- a/engines/ultima/ultima8/kernel/kernel.h
+++ b/engines/ultima/ultima8/kernel/kernel.h
@@ -135,9 +135,9 @@ public:
 		return _tickNum;
 	};
 
-	static const uint32 TICKS_PER_FRAME;
-	static const uint32 TICKS_PER_SECOND;
-	static const uint32 FRAMES_PER_SECOND;
+	static constexpr uint32 TICKS_PER_FRAME = 2;
+	static constexpr uint32 TICKS_PER_SECOND = 60;
+	static constexpr uint32 FRAMES_PER_SECOND = TICKS_PER_SECOND / TICKS_PER_FRAME;
 
 	// A special process type which means kill all the processes.
 	static const uint16 PROC_TYPE_ALL;