• R/O
  • SSH

OMP: Commit

Multiplayer platform


Commit MetaInfo

Revision879d8cb793e8794294dca18e7c6df57ddf1bc072 (tree)
Time2017-05-22 03:00:23
AuthorFace
CommiterFace

Log Message

OMPClient: fixed bug with vessels that create things on startup (e.g. Atlantis)

Change Summary

Incremental Difference

diff -r e1af7f11e1c2 -r 879d8cb793e8 Orbitersdk/samples/OMP/OMPClient/OMPClient.cpp
--- a/Orbitersdk/samples/OMP/OMPClient/OMPClient.cpp Sun May 21 19:57:32 2017 +0200
+++ b/Orbitersdk/samples/OMP/OMPClient/OMPClient.cpp Sun May 21 20:00:23 2017 +0200
@@ -1864,6 +1864,8 @@
18641864 OpenDlgClbk(NULL);
18651865
18661866 dinfo.closeDialogOnceStarted=true; //dinfo.quickLaunch || dinfo.container; change back to this if user wants dialog back at startup
1867+
1868+ EnterCriticalSection(&orbiter);
18671869 }
18681870
18691871 void CloseRenderViewport ()
@@ -2691,6 +2693,7 @@
26912693 clientData.LocalsByID->put(line, entry);
26922694 }
26932695 }
2696+ selfCreate = false; // Deactivate defense against vessel creation right on startup again.
26942697
26952698 //Create neighbour list
26962699 clientData.Neighbours=new CHashTable(USERSIZE);
@@ -4295,6 +4298,7 @@
42954298 if (state==S_CLICKSTART)
42964299 {
42974300 state=S_WAITSTART;
4301+ selfCreate = true; //This is so that vessel modules creating other vessels right on startup don't cause AddVessel to hang. It will be removed at first local vessel run in status display.
42984302 PostMessage(winfo.idcstartorbi, BM_CLICK, 0, 0);
42994303 }
43004304 if (state==S_CHOOSE)
Show on old repository browser