Revision: 2376
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2376&view=rev
Author: rorthomas
Date: 2012-01-28 15:19:04 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
fixed new gui not hiding
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gui/OverlayWrapper.h
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-01-28 15:13:54 UTC
(rev 2375)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-01-28 15:19:04 UTC
(rev 2376)
@@ -3094,7 +3094,7 @@
if(curr_truck->driveable == AIRPLANE)
ow->showDashboardOverlays(true, curr_truck);
else
-
ow->showDashboardOverlays(false);
+
ow->showDashboardOverlays(false, curr_truck);
}
curr_truck->currentcamera=0;
curr_truck->changedCamera();
@@ -5461,7 +5461,7 @@
//
position.y=hfinder->getHeightAt(position.x,position.z);
if(position != Vector3::ZERO) person->setPosition(position);
//person->setVisible(true);
- if(ow) ow->showDashboardOverlays(false);
+ if(ow) ow->showDashboardOverlays(false, currentTruck);
if(ow) ow->showEditorOverlay(false);
#ifdef USE_OPENAL
if(ssm) ssm->trigStop(previousTruck, SS_TRIG_AIR);
@@ -5577,7 +5577,7 @@
if (cameramode==CAMERA_INT)
{
currentTruck->prepareInside(true);
- if(ow) ow->showDashboardOverlays(false);
+ if(ow) ow->showDashboardOverlays(false, currentTruck);
camRotY=DEFAULT_INTERNAL_CAM_PITCH;
//if(bigMap) bigMap->setVisibility(false);
}
@@ -6467,7 +6467,7 @@
if(visible)
{
- if(ow) ow->showDashboardOverlays(false);
+ if(ow) ow->showDashboardOverlays(false, curr_truck);
if(ow) ow->showEditorOverlay(false);
if(ow) ow->truckhud->show(false);
//if(bigMap) bigMap->setVisibility(false);
Modified: trunk/source/main/gui/OverlayWrapper.h
===================================================================
--- trunk/source/main/gui/OverlayWrapper.h 2012-01-28 15:13:54 UTC (rev
2375)
+++ trunk/source/main/gui/OverlayWrapper.h 2012-01-28 15:19:04 UTC (rev
2376)
@@ -51,7 +51,7 @@
~OverlayWrapper();
// functions
- void showDashboardOverlays(bool show, Beam *truck = 0);
+ void showDashboardOverlays(bool show, Beam *truck);
void showDebugOverlay(int mode);
void showPressureOverlay(bool show);
void showEditorOverlay(bool show);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
