Revert some changes that were causing rendering issues

At least in medium quality, before joining a server, the OpenGL state
was not being set up correctly with these changes in place. The menu
opacity looked wrong.

Revert "Fix radar area blurring with fully opaque radar before a world
exists"
This reverts commit ade47c9.

Revert "Fix crashes when world is null after connect spam"
This reverts commit 070d498.

Author: blast007

src/bzflag/BackgroundRenderer.cxx

@@ -31,7 +31,6 @@
 #include "MainWindow.h"
 #include "SceneNode.h"
 #include "effectsRenderer.h"
-#include "World.h"
 
 static const GLfloat    squareShape[4][2] =
 {
@@ -665,8 +664,7 @@ void BackgroundRenderer::renderGroundEffects(SceneRenderer& renderer,
 
     if (!blank)
     {
-        const World *_world = World::getWorld();
-        if (doShadows && shadowsVisible && !drawingMirror && _world)
+        if (doShadows && shadowsVisible && !drawingMirror)
             drawGroundShadows(renderer);
 
         // draw light receivers on ground (little meshes under light sources so

src/bzflag/SceneRenderer.cxx

@@ -856,18 +856,14 @@ void SceneRenderer::renderScene(bool UNUSED(_lastFrame), bool UNUSED(_sameFrame)
     int i;
     const bool lightLists = BZDB.isTrue("lightLists");
 
-    const World* world = World::getWorld();
-
-
     // avoid OpenGL calls as long as possible -- there's a good
     // chance we're waiting on the vertical retrace.
 
     // get a list of the dynamic lights
     getLights();
 
     // get the obstacle sceneNodes and shadowNodes
-    if (world)
-        getRenderNodes();
+    getRenderNodes();
 
     // prepare transforms
     // note -- lights should not be positioned before view is set
@@ -995,16 +991,17 @@ void SceneRenderer::renderScene(bool UNUSED(_lastFrame), bool UNUSED(_sameFrame)
         if (useHiddenLineOn)
             glEnable(GL_POLYGON_OFFSET_FILL);
 
+
         ///////////////////////
         // THE BIG RENDERING //
         ///////////////////////
-        if (world)
-            doRender();
+        doRender();
 
 
         if (scene && BZDBCache::showCullingGrid)
             scene->drawCuller();
 
+        const World* world = World::getWorld();
         if (scene && BZDBCache::showCollisionGrid && (world != NULL))
             world->drawCollisionGrid();
 

src/bzflag/playing.cxx

@@ -2016,7 +2016,6 @@ static void     handleServerMessage(bool human, uint16_t code,
 {
     bool checkScores = false;
     static WordFilter *wordfilter = (WordFilter *)BZDB.getPointer("filter");
-    const World *_world = World::getWorld();
 
     switch (code)
     {
@@ -2341,10 +2340,7 @@ static void     handleServerMessage(bool human, uint16_t code,
         for (int i = 0; i < numTeams; i++)
         {
             msg = nboUnpackUShort(msg, team);
-            Team uTeam;
-            msg = uTeam.unpack(msg);
-            if (_world)
-                teams[int(team)] = uTeam;
+            msg = teams[int(team)].unpack(msg);
         }
         checkScores = true;
         break;
@@ -5743,10 +5739,8 @@ static void drawUI()
         hud->setFrameRadarTriangleCount(0);
     }
 
-    const World *_world = World::getWorld();
-
     // update the HUD (player list, alerts)
-    if (_world && hud)
+    if (World::getWorld() && hud)
         hud->render(*sceneRenderer);
 
     // draw the control panel
@@ -6124,8 +6118,7 @@ void drawFrame(const float dt)
 
         // add dynamic nodes
         SceneDatabase* scene = sceneRenderer->getSceneDatabase();
-        World *_world = World::getWorld();
-        if (scene && myTank && _world)
+        if (scene && myTank && world)
         {
 
             int i;
@@ -7324,7 +7317,7 @@ static void     playingLoop()
         }
 
         // do motion
-        if (myTank && _world)
+        if (myTank && world)
         {
             if (myTank->isAlive() && !myTank->isPaused())
             {
@@ -7374,7 +7367,7 @@ static void     playingLoop()
 #endif
 
         // adjust properties based on flags (dimensions, cloaking, etc...)
-        if (myTank && _world)
+        if (myTank)
             myTank->updateTank(dt, true);
         for (i = 0; i < curMaxPlayers; i++)
         {