View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0002786 | FSSCP | user interface | public | 2013-02-01 19:47 | 2013-02-16 08:43 |
| Reporter | Yarn | Assigned To | |||
| Priority | normal | Severity | tweak | Reproducibility | always |
| Status | resolved | Resolution | fixed | ||
| Platform | x64 | OS | Windows 7 | ||
| Product Version | 3.6.16 | ||||
| Summary | 0002786: In campaign files, have +Main Hall: override +Flags:, not vice versa | ||||
| Description | Currently, if +Flags: is set to 1, it will override whatever is set in +Main Hall:. This makes it impossible for retail-compatible campaigns to use the second main hall in retail and a different main hall in FSO. | ||||
| Additional Information | The attached patch switches the loading order of these settings, making +Main Hall: always override +Flags:. | ||||
| Tags | No tags attached. | ||||
|
|
missioncampaign.cpp.patch (773 bytes)
Index: missioncampaign.cpp
===================================================================
--- missioncampaign.cpp (revision 9519)
+++ missioncampaign.cpp (working copy)
@@ -558,15 +558,15 @@
if (optional_string("+Flags:"))
stuff_int(&cm->flags);
+ // deal with previous campaign versions
+ if (cm->flags & CMISSION_FLAG_BASTION)
+ cm->main_hall = 1;
+
// Goober5000 - new main hall stuff!
cm->main_hall = 0;
if (optional_string("+Main Hall:"))
stuff_ubyte(&cm->main_hall);
- // deal with previous campaign versions
- if (cm->flags & CMISSION_FLAG_BASTION)
- cm->main_hall = 1;
-
// Goober5000 - new debriefing persona stuff!
cm->debrief_persona_index = 0;
if (optional_string("+Debriefing Persona Index:"))
|
|
|
The patch seems good to me, but it'd probably be a good idea to get a 2nd opinion from someone who is more familiar with the campaign file. CommanderDJ perhaps? |
|
|
Looks fine to me too! I say this should go ahead and be committed. |
|
|
Fix committed to trunk@9534. |
|
fs2open: trunk r9534 2013-02-16 04:23 Ported: N/A Details Diff |
Fix for mantis 2786: from Yarn - make +Main Hall: always override +Flags: i.e. so retail-compatible campaigns can use the second main hall in retail and a different main hall in FSO |
Affected Issues 0002786 |
|
| mod - /trunk/fs2_open/code/mission/missioncampaign.cpp | Diff File | ||
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2013-02-01 19:47 | Yarn | New Issue | |
| 2013-02-01 19:47 | Yarn | File Added: missioncampaign.cpp.patch | |
| 2013-02-03 07:58 | niffiwan | Note Added: 0014684 | |
| 2013-02-03 07:58 | niffiwan | Assigned To | => niffiwan |
| 2013-02-03 07:58 | niffiwan | Status | new => code review |
| 2013-02-03 07:58 | niffiwan | Assigned To | niffiwan => |
| 2013-02-15 12:55 | CommanderDJ | Note Added: 0014710 | |
| 2013-02-16 08:43 | niffiwan | Changeset attached | => fs2open trunk r9534 |
| 2013-02-16 08:43 | niffiwan | Note Added: 0014714 | |
| 2013-02-16 08:43 | niffiwan | Status | code review => resolved |
| 2013-02-16 08:43 | niffiwan | Resolution | open => fixed |
