diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index cd32d07a..3805c4aa 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -1690,3 +1690,8 @@ keyword: match: Fortify cost mode: expert reminder: {param1}: Attach to target land you control. Fortify only as a sorcery. This card comes into play unattached and stays in play if the land leaves play. +keyword: + keyword: Regeneration + match: Regenerate + mode: inline + reminder: The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat. diff --git a/src/gui/control/graph.cpp b/src/gui/control/graph.cpp index cf3b0a43..128c732b 100644 --- a/src/gui/control/graph.cpp +++ b/src/gui/control/graph.cpp @@ -779,12 +779,10 @@ void GraphContainer::add(const GraphP& graph) { GraphControl::GraphControl(Window* parent, int id) : wxControl(parent, id) -{ - setLayout(GRAPH_TYPE_BAR); -} +{} void GraphControl::setLayout(GraphType type) { - if (type == layout) return; + if (graph && type == layout) return; GraphDataP data = graph ? graph->getData() : GraphDataP(); switch (type) { case GRAPH_TYPE_BAR: { diff --git a/tools/msw-installer/installer.iss b/tools/msw-installer/installer.iss index 5c88ce67..97f50ab7 100644 --- a/tools/msw-installer/installer.iss +++ b/tools/msw-installer/installer.iss @@ -6,7 +6,7 @@ [setup] AppName = Magic Set Editor 2 -AppVerName = Magic Set Editor 2 - 0.3.2 beta +AppVerName = Magic Set Editor 2 - 0.3.3 beta AppCopyright = Copyright © 2001-2006 Twan van Laarhoven DefaultDirName = {pf}\Magic Set Editor 2 DisableStartupPrompt = 1 @@ -63,7 +63,8 @@ Name: "style/yugioh"; Description: "Yu-Gi-Oh!"; ; program Source: "build/Release Unicode/mse.exe"; DestDir: "{app}"; Components: prog; Flags: replacesameversion -Source: "tools/msw-installer/msvcr71.dll"; DestDir: "{sys}"; Components: prog; Flags: restartreplace sharedfile uninsneveruninstall onlyifdoesntexist +; No longer needed: +;Source: "tools/msw-installer/msvcr71.dll"; DestDir: "{sys}"; Components: prog; Flags: restartreplace sharedfile uninsneveruninstall onlyifdoesntexist ; locale : en Source: "data/en.mse-locale/*"; DestDir: "{app}/data/en.mse-locale/"; Components: prog; Flags: recursesubdirs