Merge lp:~luke-jr/armagetronad/armagetronad-map-compat-legacy into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work

Proposed by Luke-Jr
Status: Merged
Merged at revision: not available
Proposed branch: lp:~luke-jr/armagetronad/armagetronad-map-compat-legacy
Merge into: lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work
Diff against target: None lines
To merge this branch: bzr merge lp:~luke-jr/armagetronad/armagetronad-map-compat-legacy
Reviewer Review Type Date Requested Status
Manuel Moos Approve
Review via email: mp+4027@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Luke-Jr (luke-jr) wrote :

Two approaches:
- Fix support for legacy maps (this branch)
- Remove support for legacy-only map elements

The first is easier and nicer. We can always remove support later. :)

Revision history for this message
Manuel Moos (z-man) wrote :

With legacy maps you mean really, really old maps?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/resource/tResource.cpp'
2--- src/resource/tResource.cpp 2008-08-24 02:10:14 +0000
3+++ src/resource/tResource.cpp 2009-02-27 22:56:19 +0000
4@@ -66,6 +66,11 @@
5 con << "\nWARNING: incorrect filepath. The resource wants to be at \"" << rightFilepath << "\", but was loaded from \"" << filepath << "\".\n\n";
6 }
7 }
8+ else
9+ if (root.IsOfType("World") && root.GetProp("version") == "0.1")
10+ {
11+ // NOTE: Legacy map resource
12+ }
13 else {
14 con << "Root node is not of type 'Resource' but '" << root.GetName() << "'.\n";
15 return false;

Subscribers

People subscribed via source and target branches

to status/vote changes: