fix level-loading crashes

src/game/CAvaraGame.cpp

@@ -142,6 +142,7 @@ void CAvaraGame::IAvaraGame(CAvaraApp *theApp) {
     statusRequest = kNoVehicleStatus;
 
     nextPingTime = 0;
+    nextLoadTime = 0;
 
     showNewHUD = gApplication ? gApplication->Get<bool>(kShowNewHUD) : false;
     // CalcGameRect();
@@ -843,6 +844,16 @@ bool CAvaraGame::GameTick() {
         nextPingTime = startTime + pingInterval;
     }
 
+    int randLoadPeriod = Debug::GetValue("rload"); // randomly load a level every `rload` seconds
+    if (randLoadPeriod > 0) {
+        if (startTime > nextLoadTime) {
+            auto p = CPlayerManagerImpl::LocalPlayer();
+            auto *tui = itsApp->GetTui();
+            tui->ExecuteMatchingCommand("/rand", p);
+            nextLoadTime = startTime + 1000*randLoadPeriod;
+        }
+    }
+
     // Not playing? Nothing to do!
     if (statusRequest != kPlayingStatus)
         return false;

src/game/CAvaraGame.h

@@ -179,6 +179,7 @@ class CAvaraGame {
 
     uint32_t nextScheduledFrame;
     uint32_t nextPingTime;
+    uint32_t nextLoadTime;
     long lastFrameTime;
     Boolean canPreSend;
 

vendor/nanogui/nanogui/screen.h

@@ -188,6 +188,8 @@ class NANOGUI_EXPORT Screen : public Widget {
     void moveWindowToFront(Window *window);
     void drawWidgets();
 
+    virtual void removeNotifyParent(const Widget *w) override;
+
 protected:
     SDL_Window *mSDLWindow;
     uint32_t mWindowID;

vendor/nanogui/nanogui/widget.h

@@ -63,10 +63,16 @@ class NANOGUI_EXPORT Widget : public Object {
     /// Set the position relative to the parent widget
     void setPosition(const Vector2i &pos) { mPos = pos; }
 
+    /// return position of parent or zeros if no parent
+    Vector2i parentPosition() const {
+        static Vector2i zeroPos = {};
+        return mParent ?
+            (mParent->absolutePosition()) : zeroPos;
+    }
+
     /// Return the absolute position on screen
     Vector2i absolutePosition() const {
-        return mParent ?
-            (parent()->absolutePosition() + mPos) : mPos;
+        return parentPosition() + mPos;
     }
 
     /// Return the size of the widget
@@ -148,6 +154,9 @@ class NANOGUI_EXPORT Widget : public Object {
     /// Remove a child widget by value
     void removeChild(const Widget *widget);
 
+    /// notify other widgets/parents
+    virtual void removeNotifyParent(const Widget *w);
+
     /// Retrieves the child at the specific position
     const Widget* childAt(int index) const { return mChildren[index]; }
 

vendor/nanogui/screen.cpp

@@ -444,7 +444,7 @@ bool Screen::cursorPosCallbackEvent(double x, double y) {
             }
         } else {
             ret = mDragWidget->mouseDragEvent(
-                p - mDragWidget->parent()->absolutePosition(), p - mMousePos,
+                p - mDragWidget->parentPosition(), p - mMousePos,
                 mMouseState, mModifiers);
         }
 
@@ -482,7 +482,7 @@ bool Screen::mouseButtonCallbackEvent(int button, int action, int modifiers) {
         if (mDragActive && action == SDL_RELEASED &&
             dropWidget != mDragWidget)
             mDragWidget->mouseButtonEvent(
-                mMousePos - mDragWidget->parent()->absolutePosition(), button,
+                mMousePos - mDragWidget->parentPosition(), button,
                 false, mModifiers);
 
         if (dropWidget != nullptr && dropWidget->cursor() != mCursor) {
@@ -694,4 +694,15 @@ bool Screen::handleSDLEvent(SDL_Event &event) {
     return false;
 }
 
+
+void Screen::removeNotifyParent(const Widget *w) {
+    // remove widget from various places before deletion
+    if (w == mDragWidget) {
+        mDragWidget = nullptr;
+        mDragActive = false;
+    }
+    mFocusPath.erase(std::remove(mFocusPath.begin(), mFocusPath.end(), w), mFocusPath.end());
+    Widget::removeNotifyParent(w);
+}
+
 NAMESPACE_END(nanogui)

vendor/nanogui/widget.cpp

@@ -160,10 +160,21 @@ void Widget::removeChild(const Widget *widget) {
 
 void Widget::removeChild(int index) {
     Widget *widget = mChildren[index];
+    removeNotifyParent(widget);
     mChildren.erase(mChildren.begin() + index);
     widget->decRef();
 }
 
+// climb the tree and let everyone (Screen) know this object is being removed.
+// ideally we would change everything to use shared_ptr<Widget> and maybe some weak_ptr references...
+// but, i'm lazy and this code should all get replaced soon (right?)
+void Widget::removeNotifyParent(const Widget *w) {
+    if (mParent) {
+        mParent->removeNotifyParent(w);
+    }
+    return;
+}
+
 int Widget::childIndex(Widget *widget) const {
     auto it = std::find(mChildren.begin(), mChildren.end(), widget);
     if (it == mChildren.end())