Ignore:
Timestamp:
Aug 1, 2022, 1:16:11 PM (2 years ago)
Author:
alloc
Message:

Fixed a bunch of warnings

Location:
binary-improvements2/MapRendering
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • binary-improvements2/MapRendering/Commands/EnableOpenIDDebug.cs

    r359 r383  
    1 using System;
    21using System.Collections.Generic;
    32using AllocsFixes.NetConnections.Servers.Web;

  • binary-improvements2/MapRendering/Commands/EnableRendering.cs

    r359 r383  
    1 using System;
    21using System.Collections.Generic;
    32

  • binary-improvements2/MapRendering/Commands/ReloadWebPermissions.cs

    r359 r383  
    1 using System;
    21using System.Collections.Generic;
    32using AllocsFixes.NetConnections.Servers.Web;

  • binary-improvements2/MapRendering/Commands/RenderMap.cs

    r359 r383  
    1 using System;
    21using System.Collections.Generic;
    32

  • binary-improvements2/MapRendering/Commands/webstat.cs

    r359 r383  
    1 using System;
    21using System.Collections.Generic;
    32using AllocsFixes.NetConnections.Servers.Web;

  • binary-improvements2/MapRendering/MapRendering/MapRendering.cs

    r369 r383  
    2424                private bool renderingFullMap;
    2525                private float renderTimeout = float.MaxValue;
     26                private bool shutdown;
    2627
    2728                private MapRendering () {
    … …  
    5960
    6061                public static void Shutdown () {
    61                         if (Instance?.renderCoroutineRef != null) {
     62                        if (Instance == null) {
     63                                return;
     64                        }
     65
     66                        Instance.shutdown = true;
     67                       
     68                        if (Instance.renderCoroutineRef != null) {
    6269                                ThreadManager.StopCoroutine (Instance.renderCoroutineRef);
    6370                                Instance.renderCoroutineRef = null;
    … …  
    201208
    202209                private IEnumerator renderCoroutine () {
    203                         while (true) {
     210                        while (!shutdown) {
    204211                                lock (lockObject) {
    205                                         if (dirtyChunks.Count > 0 && renderTimeout == float.MaxValue) {
     212                                        if (dirtyChunks.Count > 0 && renderTimeout >= float.MaxValue / 2) {
    206213                                                renderTimeout = Time.time + 0.5f;
    207214                                        }
    … …  
    239246                        //Log.Out ("Start Dirty: " + chunkPos);
    240247
    241                         Vector2i block, blockOffset;
    242                         getBlockNumber (chunkPos, out block, out blockOffset, Constants.MAP_BLOCK_TO_CHUNK_DIV,
    243                                 Constants.MAP_CHUNK_SIZE);
     248                        getBlockNumber (chunkPos, out Vector2i block, out _, Constants.MAP_BLOCK_TO_CHUNK_DIV, Constants.MAP_CHUNK_SIZE);
    244249
    245250                        zoomLevelBuffers [Constants.ZOOMLEVELS - 1].LoadBlock (block);

  • binary-improvements2/MapRendering/Web/API/GetAllowedCommands.cs

    r382 r383  
    1 using System.Net;
    21using AllocsFixes.JSON;
    32using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;

  • binary-improvements2/MapRendering/Web/API/GetAnimalsLocation.cs

    r382 r383  
    11using System.Collections.Generic;
    2 using System.Net;
    32using AllocsFixes.JSON;
    43using AllocsFixes.LiveData;

  • binary-improvements2/MapRendering/Web/API/GetHostileLocation.cs

    r382 r383  
    11using System.Collections.Generic;
    2 using System.Net;
    32using AllocsFixes.JSON;
    43using AllocsFixes.LiveData;

  • binary-improvements2/MapRendering/Web/API/GetLog.cs

    r382 r383  
    11using System.Collections.Generic;
    2 using System.Net;
    32using AllocsFixes.JSON;
    43using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;

  • binary-improvements2/MapRendering/Web/API/GetPlayerInventories.cs

    r382 r383  
    11using System.Collections.Generic;
    2 using System.Net;
    32using AllocsFixes.JSON;
    43using AllocsFixes.PersistentData;

  • binary-improvements2/MapRendering/Web/API/GetPlayerList.cs

    r382 r383  
    22using System.Collections.Generic;
    33using System.Linq;
    4 using System.Net;
    54using System.Text.RegularExpressions;
    65using AllocsFixes.JSON;

  • binary-improvements2/MapRendering/Web/API/GetPlayersLocation.cs

    r382 r383  
    11using System.Collections.Generic;
    2 using System.Net;
    32using AllocsFixes.JSON;
    43using AllocsFixes.PersistentData;

  • binary-improvements2/MapRendering/Web/API/GetPlayersOnline.cs

    r382 r383  
    11using System.Collections.Generic;
    2 using System.Net;
    32using AllocsFixes.JSON;
    43using AllocsFixes.PersistentData;

  • binary-improvements2/MapRendering/Web/API/GetServerInfo.cs

    r382 r383  
    11using System;
    2 using System.Net;
    32using AllocsFixes.JSON;
    43using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;

  • binary-improvements2/MapRendering/Web/API/GetStats.cs

    r382 r383  
    1 using System.Net;
    21using AllocsFixes.JSON;
    32using AllocsFixes.LiveData;

  • binary-improvements2/MapRendering/Web/API/GetWebUIUpdates.cs

    r382 r383  
    1 using System.Net;
    21using AllocsFixes.JSON;
    32using AllocsFixes.LiveData;

  • binary-improvements2/MapRendering/Web/API/Null.cs

    r382 r383  
    1 using System.Net;
    2 using System.Text;
     1using System.Text;
    32using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
    43using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;

  • binary-improvements2/MapRendering/Web/Handlers/AbsHandler.cs

    r382 r383  
    1 using System.Net;
    21using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
    32using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;

  • binary-improvements2/MapRendering/Web/Handlers/SimpleRedirectHandler.cs

    r382 r383  
    1 using System.Net;
    21using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
    32using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;

  • binary-improvements2/MapRendering/Web/Web.cs

    r382 r383  
    164164                                response.ProtocolVersion = httpProtocolVersion;
    165165
     166                                // No game yet -> fail request
     167                                if (GameManager.Instance.World == null) {
     168                                        response.StatusCode = (int) HttpStatusCode.ServiceUnavailable;
     169                                        return;
     170                                }
     171
     172                                if (request.Url == null) {
     173                                        response.StatusCode = (int) HttpStatusCode.BadRequest;
     174                                        return;
     175                                }
     176
    166177#if ENABLE_PROFILER
    167178                                authSampler.Begin ();
    … …  
    172183#endif
    173184
    174 
    175185                                //Log.Out ("Login status: conn!=null: {0}, permissionlevel: {1}", conn != null, permissionLevel);
    176 
    177186
    178187                                if (conn != null) {
    … …  
    186195                                }
    187196
    188                                 // No game yet -> fail request
    189                                 if (GameManager.Instance.World == null) {
    190                                         response.StatusCode = (int) HttpStatusCode.ServiceUnavailable;
    191                                         return;
    192                                 }
    193 
    194197                                string requestPath = request.Url.AbsolutePath;
    195198
Note: See TracChangeset for help on using the changeset viewer.