Merge branch 'master' into 1.11

This commit is contained in:
dP
2021-03-24 23:07:53 +03:00
36 changed files with 2646 additions and 322 deletions
+2 -2
View File
@@ -577,7 +577,7 @@ protected:
this->active_button_id = INVALID_STORY_PAGE_ELEMENT;
} else {
CursorID cursor = TranslateStoryPageButtonCursor(StoryPageButtonData{ pe.referenced_id }.GetCursor());
SetObjectToPlaceWnd(cursor, PAL_NONE, HT_RECT, this);
SetObjectToPlaceWnd(cursor, PAL_NONE, HT_RECT, this, CM_DDSP_STORY_BUTTON);
this->active_button_id = pe.index;
}
this->SetWidgetDirty(WID_SB_PAGE_PANEL);
@@ -589,7 +589,7 @@ protected:
this->active_button_id = INVALID_STORY_PAGE_ELEMENT;
} else {
CursorID cursor = TranslateStoryPageButtonCursor(StoryPageButtonData{ pe.referenced_id }.GetCursor());
SetObjectToPlaceWnd(cursor, PAL_NONE, HT_VEHICLE, this);
SetObjectToPlaceWnd(cursor, PAL_NONE, HT_VEHICLE, this, CM_DDSP_STORY_BUTTON);
this->active_button_id = pe.index;
}
this->SetWidgetDirty(WID_SB_PAGE_PANEL);