[Scummvm-git-logs] scummvm master -> 25db1aee6ca3bf7bc9881b136e26508e8a6ad30c

aquadran noreply at scummvm.org
Fri Oct 25 18:57:02 UTC 2024


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

Summary:
25db1aee6c WINTERMUTE: Small cleanup


Commit: 25db1aee6ca3bf7bc9881b136e26508e8a6ad30c
    https://github.com/scummvm/scummvm/commit/25db1aee6ca3bf7bc9881b136e26508e8a6ad30c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-25T20:56:57+02:00

Commit Message:
WINTERMUTE: Small cleanup

Changed paths:
    engines/wintermute/ad/ad_scene.cpp
    engines/wintermute/ad/ad_scene_geometry.cpp


diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index a30335293fb..6617bf3ff43 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -170,8 +170,6 @@ void AdScene::setDefaults() {
 	_fogStart = 0.0f;
 	_fogEnd = 0.0f;
 #endif
-
-	_viewport = nullptr;
 }
 
 
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
index c2df93b3acd..739bece669e 100644
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -63,10 +63,10 @@ AdSceneGeometry::AdSceneGeometry(BaseGame *gameRef) : BaseObject(gameRef) {
 	_activeCamera = _activeLight = -1;
 	DXMatrixIdentity(&_viewMatrix);
 	_waypointHeight = 10.0f;
-	_wptMarker = NULL;
+	_wptMarker = nullptr;
 
 	_PFReady = true;
-	_PFTargetPath = NULL;
+	_PFTargetPath = nullptr;
 	_PFMaxTime = 15;
 	_PFRerun = false;
 




More information about the Scummvm-git-logs mailing list