eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 00:59:18 +02:00
Code Issues 121 Wiki Activity

dangling pointer crash semi-fix, minor bug fixes, minor code correctness enhancements

Browse Source
This commit is contained in:
tmj-fstate
2018-07-16 02:40:53 +02:00
parent ed1e0d8a10
commit 3751c8a0a8
28 changed files with 895 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
World.cpp
View File

@@ -128,7 +128,7 @@ bool TWorld::Init( GLFWwindow *Window ) {
Controlled = NULL;
mvControlled = NULL;
SafeDelete( Train );
Camera.Type = tp_Free;
Camera.Type = TCameraType::tp_Free;
}
}
else
@@ -141,7 +141,7 @@ bool TWorld::Init( GLFWwindow *Window ) {
glfwSwapBuffers( window );
Controlled = NULL;
mvControlled = NULL;
Camera.Type = tp_Free;
Camera.Type = TCameraType::tp_Free;
DebugCamera = Camera;
Global.DebugCameraPosition = DebugCamera.Pos;
}
@@ -699,7 +699,7 @@ bool TWorld::Update() {
// fixed step part of the camera update
if( ( Train != nullptr )
&& ( Camera.Type == tp_Follow )
&& ( Camera.Type == TCameraType::tp_Follow )
&& ( false == DebugCameraFlag ) ) {
// jeśli jazda w kabinie, przeliczyć trzeba parametry kamery
Train->UpdateMechPosition( m_secondaryupdaterate );
@@ -825,7 +825,7 @@ TWorld::Update_Camera( double const Deltatime ) {
Global.CabWindowOpen = false;
if( ( Train != nullptr )
&& ( Camera.Type == tp_Follow )
&& ( Camera.Type == TCameraType::tp_Follow )
&& ( false == DebugCameraFlag ) ) {
// jeśli jazda w kabinie, przeliczyć trzeba parametry kamery
auto tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 );