Revision: 1485
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1485&view=rev
Author: rorthomas
Date: 2010-07-22 01:43:17 +0000 (Thu, 22 Jul 2010)
Log Message:
-----------
removed old playerlist overlay from code and resources
Modified Paths:
--------------
trunk/bin/resources/overlays.zip
trunk/source/main/OverlayWrapper.cpp
trunk/source/main/OverlayWrapper.h
trunk/source/main/RoRFrameListener.cpp
Modified: trunk/bin/resources/overlays.zip
===================================================================
(Binary files differ)
Modified: trunk/source/main/OverlayWrapper.cpp
===================================================================
--- trunk/source/main/OverlayWrapper.cpp 2010-07-22 01:38:11 UTC (rev
1484)
+++ trunk/source/main/OverlayWrapper.cpp 2010-07-22 01:43:17 UTC (rev
1485)
@@ -363,8 +363,6 @@
flashOverlay->add2D(flashPanel);
- playerListOverlay = loadOverlay("tracks/MPPlayerList");
-
pressureOverlay = loadOverlay("tracks/PressureOverlay");
pressureNeedleOverlay = loadOverlay("tracks/PressureNeedleOverlay");
editorOverlay = loadOverlay("tracks/EditorOverlay");
Modified: trunk/source/main/OverlayWrapper.h
===================================================================
--- trunk/source/main/OverlayWrapper.h 2010-07-22 01:38:11 UTC (rev 1484)
+++ trunk/source/main/OverlayWrapper.h 2010-07-22 01:43:17 UTC (rev 1485)
@@ -80,7 +80,6 @@
Ogre::Overlay *airneedlesOverlay;
Ogre::Overlay *boatneedlesOverlay;
Ogre::Overlay *needlesMaskOverlay;
- Ogre::Overlay *playerListOverlay;
Ogre::Overlay *pressureOverlay;
Ogre::Overlay *pressureNeedleOverlay;
Ogre::Overlay *editorOverlay;
Modified: trunk/source/main/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/RoRFrameListener.cpp 2010-07-22 01:38:11 UTC (rev
1484)
+++ trunk/source/main/RoRFrameListener.cpp 2010-07-22 01:43:17 UTC (rev
1485)
@@ -4053,7 +4053,6 @@
bigMap->updateRenderMetrics(mWindow);
bigMap->setPosition(0, 0.81,
0.14, 0.19, mWindow);
}
- if(net && ow)
ow->playerListOverlay->hide();
} else if(mapMode==1)
{
bigMap->setVisibility(true);
@@ -4062,11 +4061,9 @@
bigMap->updateRenderMetrics(mWindow);
bigMap->setPosition(0.2, 0, 0.8, 0.8,
mWindow);
//NETCHAT.setMode(this, NETCHAT_MAP,
true);
- if(net && ow)
ow->playerListOverlay->show();
} else
{
bigMap->setVisibility(false);
- if(net && ow)
ow->playerListOverlay->hide();
}
}
@@ -4637,7 +4634,6 @@
//make it small again
bigMap->updateRenderMetrics(mWindow);
bigMap->setPosition(0, 0.81, 0.14, 0.19, mWindow);
- if(net && ow) ow->playerListOverlay->hide();
//bigMap->setPosition(0, 0, 1, 1);
//bigMap->resizeToScreenRatio(win);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
