|
1 | 1 | #include "BriefingEditorDialogModel.h" |
2 | 2 |
|
3 | 3 | #include "gamesnd/eventmusic.h" |
4 | | -#include "mission/missionparse.h" //TODO remove? |
5 | | -#include "missionui/missioncmdbrief.h" //TODO remove? |
| 4 | +#include "mission/missionparse.h" |
6 | 5 | #include "sound/audiostr.h" |
7 | 6 | #include "iff_defs/iff_defs.h" |
8 | 7 |
|
@@ -164,8 +163,8 @@ void BriefingEditorDialogModel::addStage() |
164 | 163 | if (_currentStage > 0) { |
165 | 164 | const brief_stage& prev = _wipBriefings[_currentTeam].stages[_currentStage - 1]; |
166 | 165 |
|
167 | | - dst = prev; // start by copying everything… |
168 | | - // …then clear fields that should not carry over by default |
| 166 | + dst = prev; // start by copying everything |
| 167 | + // then clear fields that should not carry over by default |
169 | 168 | dst.text = "<Text here>"; |
170 | 169 | dst.voice[0] = '\0'; |
171 | 170 | } else { |
@@ -665,7 +664,7 @@ int BriefingEditorDialogModel::getIconShipTypeIndex() const |
665 | 664 | const auto& s = b.stages[_currentStage]; |
666 | 665 | if (_currentIcon < 0 || _currentIcon >= s.num_icons) |
667 | 666 | return -1; |
668 | | - return s.icons[_currentIcon].ship_class; // may be -1 for “unset” depending on icon type |
| 667 | + return s.icons[_currentIcon].ship_class; // may be -1 for "unset" depending on icon type |
669 | 668 | } |
670 | 669 |
|
671 | 670 | void BriefingEditorDialogModel::setIconShipTypeIndex(int idx) |
@@ -1042,7 +1041,7 @@ void BriefingEditorDialogModel::makeIcon(const SCP_string& label, int typeIndex, |
1042 | 1041 | for (int i = 0; i < bs.num_icons; ++i) |
1043 | 1042 | maxId = std::max(maxId, bs.icons[i].id); |
1044 | 1043 | } |
1045 | | - return maxId + 1; // unique within this team’s briefing |
| 1044 | + return maxId + 1; // unique within this team's briefing |
1046 | 1045 | }; |
1047 | 1046 |
|
1048 | 1047 | // Clamp incoming indices to safe ranges |
|
0 commit comments