[Scummvm-git-logs] scummvm master -> 6b23e37bc174100e377279981955eca7cdf5a56c

[neuromancer]

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

Summary:
57226cc162 FREESCAPE: avoiding locking the mouse and always use the system screen resolution
6b23e37bc1 FREESCAPE: removed extra semicolon


Commit: 57226cc16217326725306a93a78bed912a09b31e
    https://github.com/scummvm/scummvm/commit/57226cc16217326725306a93a78bed912a09b31e
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-12-13T11:07:49-03:00

Commit Message:
FREESCAPE: avoiding locking the mouse and always use the system screen resolution

Changed paths:
    engines/freescape/freescape.cpp


diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index aa8bd131913..3824c72f5ea 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -81,8 +81,6 @@ FreescapeEngine::FreescapeEngine(OSystem *syst, const ADGameDescription *gd)
 	_mouseSensitivity = 0.25f;
 	_demoMode = false;
 	_shootMode = false;
-	_crossairPosition.x = _screenW / 2;
-	_crossairPosition.y = _screenH / 2;
 	_demoIndex = 0;
 	_currentDemoInputCode = 0;
 	_currentDemoInputRepetition = 0;
@@ -473,7 +471,12 @@ void FreescapeEngine::processInput() {
 Common::Error FreescapeEngine::run() {
 	_frameLimiter = new Graphics::FrameLimiter(g_system, ConfMan.getInt("engine_speed"));
 	// Initialize graphics
+	_screenW = g_system->getWidth();
+	_screenH = g_system->getHeight();
 	_gfx = createRenderer(_screenW, _screenH, _renderMode);
+	_crossairPosition.x = _screenW / 2;
+	_crossairPosition.y = _screenH / 2;
+
 	// The following error code will force return to launcher
 	// but it will not force any other GUI message to be displayed
 	if (!_gfx)
@@ -492,7 +495,6 @@ Common::Error FreescapeEngine::run() {
 
 	// Simple main event loop
 	int saveSlot = ConfMan.getInt("save_slot");
-	_system->lockMouse(true);
 	centerCrossair();
 
 	if (_title) {


Commit: 6b23e37bc174100e377279981955eca7cdf5a56c
    https://github.com/scummvm/scummvm/commit/6b23e37bc174100e377279981955eca7cdf5a56c
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-12-13T11:07:49-03:00

Commit Message:
FREESCAPE: removed extra semicolon

Changed paths:
    engines/freescape/objects/geometricobject.cpp


diff --git a/engines/freescape/objects/geometricobject.cpp b/engines/freescape/objects/geometricobject.cpp
index b39c35b1f33..ed19eeafd08 100644
--- a/engines/freescape/objects/geometricobject.cpp
+++ b/engines/freescape/objects/geometricobject.cpp
@@ -171,7 +171,7 @@ GeometricObject::GeometricObject(
 void GeometricObject::setOrigin(Math::Vector3d origin_) {
 	_origin = origin_;
 	computeBoundingBox();
-};
+}
 
 void GeometricObject::scale(int factor) {
 	_origin = _origin / factor;