View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0003080 | FSSCP | tables | public | 2014-07-30 13:23 | 2014-07-30 18:32 |
| Reporter | MjnMixael | Assigned To | |||
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | resolved | Resolution | fixed | ||
| Platform | PC | OS | Windows | OS Version | Win7 |
| Product Version | 3.7.1 | ||||
| Target Version | 3.7.2 | ||||
| Summary | 0003080: Commit 10961 Broke some Mainhall table options | ||||
| Description | Somehow commit 10961 moved the code for +Door mas value, +Door action, and +Door description above +Num Door Animations.. which if you are familiar with the mainhall table, will not work. Dunno how they got moved, but I ran into the same issues when patching Mantis 3073 with Mantis 3071.. the patches work together, but the ACT of patching them caused weird things that I had to manually fix. | ||||
| Additional Information | This patch, if I've created the patch correctly, resolves the issue by moving lines 2340-2406 below line 2440. | ||||
| Tags | No tags attached. | ||||
|
|
mainhallmenufix.patch (2,846 bytes)
Index: code/menuui/mainhallmenu.cpp
===================================================================
--- code/menuui/mainhallmenu.cpp (revision 10961)
+++ code/menuui/mainhallmenu.cpp (working copy)
@@ -2337,6 +2337,40 @@
region_info_init(*m);
+ // door animations
+ required_string("+Num Door Animations:");
+ stuff_int(&m->num_door_animations);
+
+ // initialise the door anim vectors
+ door_anim_init(*m);
+
+ for (idx = 0; idx < m->num_door_animations; idx++) {
+ // door name
+ required_string("+Door anim:");
+ stuff_string(temp_string, F_NAME, MAX_FILENAME_LEN);
+ m->door_anim_name.at(idx) = (SCP_string)temp_string;
+ }
+
+ for (idx = 0; idx < m->num_door_animations; idx++) {
+ // door coords
+ required_string("+Door coords:");
+ stuff_int(&m->door_anim_coords.at(idx).at(0));
+ stuff_int(&m->door_anim_coords.at(idx).at(1));
+ stuff_int(&m->door_anim_coords.at(idx).at(2));
+ stuff_int(&m->door_anim_coords.at(idx).at(3));
+ }
+
+ for (idx = 0; idx < m->num_door_animations; idx++) {
+ // door open and close sounds
+ parse_sound_list("+Door sounds:", m->door_sounds.at(idx), "+Door sounds:", (parse_sound_flags)(PARSE_SOUND_INTERFACE_SOUND | PARSE_SOUND_SCP_SOUND_LIST));
+ }
+
+ for (idx = 0; idx < m->num_door_animations; idx++) {
+ // door pan value
+ required_string("+Door pan:");
+ stuff_float(&m->door_sound_pan[idx]);
+ }
+
int mask;
for (idx = 0; optional_string("+Door mask value:"); idx++) {
// door mask
@@ -2405,40 +2439,6 @@
}
}
- // door animations
- required_string("+Num Door Animations:");
- stuff_int(&m->num_door_animations);
-
- // initialise the door anim vectors
- door_anim_init(*m);
-
- for (idx = 0; idx < m->num_door_animations; idx++) {
- // door name
- required_string("+Door anim:");
- stuff_string(temp_string, F_NAME, MAX_FILENAME_LEN);
- m->door_anim_name.at(idx) = (SCP_string)temp_string;
- }
-
- for (idx = 0; idx < m->num_door_animations; idx++) {
- // door coords
- required_string("+Door coords:");
- stuff_int(&m->door_anim_coords.at(idx).at(0));
- stuff_int(&m->door_anim_coords.at(idx).at(1));
- stuff_int(&m->door_anim_coords.at(idx).at(2));
- stuff_int(&m->door_anim_coords.at(idx).at(3));
- }
-
- for (idx = 0; idx < m->num_door_animations; idx++) {
- // door open and close sounds
- parse_sound_list("+Door sounds:", m->door_sounds.at(idx), "+Door sounds:", (parse_sound_flags)(PARSE_SOUND_INTERFACE_SOUND | PARSE_SOUND_SCP_SOUND_LIST));
- }
-
- for (idx = 0; idx < m->num_door_animations; idx++) {
- // door pan value
- required_string("+Door pan:");
- stuff_float(&m->door_sound_pan[idx]);
- }
-
// font for tooltips and other text
if (optional_string("+Font:")) {
stuff_int(&m->font);
|
|
|
r10961 did not do this; r10941 did (the commit of Mantis 3071), and that matches the patch file attached to that issue. "which if you are familiar with the mainhall table, will not work." I am not familiar with the mainhall table, but I don't see why you can't just put +Door mask value, +Door action, and +Door description above +Num Door Animations, since the former group does not depend on information provided by the latter, as far as I can tell. |
|
|
If you don't believe me, then test it. Before this patch, the table would not parse correctly. |
|
|
Fix committed to trunk@10962. |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2014-07-30 13:23 | MjnMixael | New Issue | |
| 2014-07-30 13:23 | MjnMixael | File Added: mainhallmenufix.patch | |
| 2014-07-30 16:44 | MageKing17 | Note Added: 0016157 | |
| 2014-07-30 18:08 | MjnMixael | Note Added: 0016158 | |
| 2014-07-30 18:09 | MjnMixael | Note Edited: 0016158 | |
| 2014-07-30 18:32 | The_E | Changeset attached | => fs2open trunk r10962 |
| 2014-07-30 18:32 | The_E | Note Added: 0016159 | |
| 2014-07-30 18:32 | The_E | Status | new => resolved |
| 2014-07-30 18:32 | The_E | Resolution | open => fixed |
