Commit a0dbc09b authored by twanvl's avatar twanvl

set.validate() used for adding initial card to a set

parent 892bf255
...@@ -90,6 +90,7 @@ SetP MSE1FileFormat::importSet(const String& filename) { ...@@ -90,6 +90,7 @@ SetP MSE1FileFormat::importSet(const String& filename) {
} }
// done // done
set->validate();
return set; return set;
} }
......
...@@ -202,6 +202,7 @@ SetP MtgEditorFileFormat::importSet(const String& filename) { ...@@ -202,6 +202,7 @@ SetP MtgEditorFileFormat::importSet(const String& filename) {
set->stylesheet = StyleSheet::byGameAndName(*set->game, _("new")); set->stylesheet = StyleSheet::byGameAndName(*set->game, _("new"));
} }
set->validate();
return set; return set;
} }
......
...@@ -99,6 +99,8 @@ void Set::validate(Version file_app_version) { ...@@ -99,6 +99,8 @@ void Set::validate(Version file_app_version) {
FOR_EACH(v, s.second->data) fix_value_207(v); FOR_EACH(v, s.second->data) fix_value_207(v);
} }
*/ } */ }
// we want at least one card
if (cards.empty()) cards.push_back(new_shared1<Card>(*game));
// update scripts // update scripts
script_manager->updateAll(); script_manager->updateAll();
} }
......
...@@ -96,12 +96,13 @@ class Set : public Packaged { ...@@ -96,12 +96,13 @@ class Set : public Packaged {
/// Clear the order_cache used by positionOfCard /// Clear the order_cache used by positionOfCard
void clearOrderCache(); void clearOrderCache();
protected:
virtual String typeName() const; virtual String typeName() const;
virtual void validate(Version); /// Validate that the set is correctly loaded
virtual void validate(Version = app_version);
DECLARE_REFLECTION();
private: private:
DECLARE_REFLECTION();
/// Object for managing and executing scripts /// Object for managing and executing scripts
scoped_ptr<SetScriptManager> script_manager; scoped_ptr<SetScriptManager> script_manager;
/// Object for executing scripts from the thumbnail thread /// Object for executing scripts from the thumbnail thread
......
...@@ -77,7 +77,7 @@ void NewSetWindow::OnOK(wxCommandEvent&) { ...@@ -77,7 +77,7 @@ void NewSetWindow::OnOK(wxCommandEvent&) {
void NewSetWindow::done() { void NewSetWindow::done() {
StyleSheetP stylesheet = stylesheet_list->getSelection<StyleSheet>(); StyleSheetP stylesheet = stylesheet_list->getSelection<StyleSheet>();
set = new_shared1<Set>(stylesheet); set = new_shared1<Set>(stylesheet);
set->cards.push_back(new_shared1<Card>(*set->game)); set->validate();
EndModal(wxID_OK); EndModal(wxID_OK);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment