Commit Graph

1623 Commits

Author SHA1 Message Date
c2ce2a2cd1 Split up the graphtool files 2017-04-14 15:43:07 -04:00
e57441f6a0 Consolidate active quest data into a single map 2017-04-14 11:38:06 -04:00
5b5b2af46f Remove custom erase_if function in favor of std::remove_if
It was originally added before I understood the correct way to use remove_if

As a side-effect, remove bad status now also removes forcecage and charm.
2017-04-14 11:37:27 -04:00
936a848166 Move terrain blockage check into cTerrain class 2017-04-14 01:12:56 -04:00
4baac518e9 Move stream operator declarations into the same file as their types 2017-04-14 01:07:21 -04:00
e98f9381fe Move special node category into the node properties struct 2017-04-14 00:50:38 -04:00
791c2a27d4 Update style guide on header order 2017-04-14 00:28:12 -04:00
d5a02fa4cb Ignore any unpacked scenarios in the rsrc subtree 2017-04-14 00:27:20 -04:00
82abdab695 Major code reorganization
This commit only updates the XCode project for the changes.
A later commit each will update it for scons and MSVC.

A few actual changes are mixed in:
- Add a prefix header for a handful of common definitions
- Moved current_cursor into the Cursor class as a static member
- Removed the make_cursor_sword and make_cursor_watch functions
- Include tests in the All target
- Remove redundant -l flags for Common and Common-Party (since they're included in the Link phases anyway)
2017-04-14 00:24:29 -04:00
b624841bea Windows/ScenEd: Enable undo/redo as appropriate 2017-04-12 02:03:47 -04:00
73f49725b4 Fix error in redo code 2017-04-12 02:03:38 -04:00
c9e265ca62 Windows: Change several menu mnemonics and fix create town menuitem not working 2017-04-12 00:51:21 -04:00
7b08835bf9 Fix crash if a display message node referenced only empty strings 2017-04-12 00:50:15 -04:00
766853d7a4 Fix unit tests 2017-04-11 20:42:25 -04:00
945a7a9e5a Fix boats/horses not appearing 2017-04-11 20:03:54 -04:00
d85321747d Fix issues with items not appearing 2017-04-11 19:55:37 -04:00
32402e77b5 Simplify town entry code with references 2017-04-11 19:25:51 -04:00
ce8ed29c67 Some indentation fixes 2017-04-11 18:57:25 -04:00
7d686042f4 Scenario Editor: Remove Edit Boats/Horses option from menu since it no longer functions 2017-04-11 18:43:09 -04:00
10832a3ed4 PC Editor: Fix item menus for scenarios with less than 400 or more than 403 items.
- On Mac, Items 2 - 4 would give you the wrong item.
- On both Windows and Macs, items at the end of the list might be missing altogether.
2017-04-11 18:36:39 -04:00
d588efd11b PC Editor: Fix items not loading 2017-04-11 18:00:41 -04:00
45604a22b9 Saved Games: Always store current sp even when at max
This should fix the issue of SP being set to 0 when reloading a game,
though existing saves will not be magically fixed.
2017-04-11 17:32:46 -04:00
3c6190c433 PC Editor: Fix inability to edit spells 2017-04-11 17:28:43 -04:00
4f91f6a679 Make undo system a little safer, and improve docs 2017-04-11 15:00:22 -04:00
688869260b BB: Lots of spelling/grammar fixes
Thanks to ADoS for these fixes
2017-02-12 20:56:48 -05:00
3c422f3870 BB: Add descriptions for the custom items 2017-02-12 20:53:40 -05:00
7fc3001245 Confirm before creating a new scenario when one is being edited 2017-02-12 18:27:44 -05:00
683ab805ec Initial framework for scenario editor undo/redo
In addition to the framework, this enables undo/redo of one action - adding a new town
2017-02-12 18:27:01 -05:00
e38053d39f Remove some spurious scenario editor error messages
These errors are all no longer necessary due to the editor loading the entire scenario into memory at the same time
2017-02-12 18:19:29 -05:00
59f2a7b94e Some code cleanup, mainly constants
- Strip out unused constants
- Use const instead of #define
- Remove some obsolete comments
2017-02-12 00:04:53 -05:00
2b8ff52992 Don't cancel adding a special shop entry if the node hasn't been set
(The designer may want to add the entry and then later come back and create the node.)
2017-02-10 12:13:46 -05:00
e1ca44f417 Change editor shop item icons for random entries
(They were incorrect due to item sheet shuffling)
2017-02-10 12:12:59 -05:00
e3c726642b BoEB: Strip trailing null specials in Warrior's Grove and outdoors 2017-02-10 11:31:30 -05:00
966a35ee6f BoEB: Add area descriptions to Warrior's Grove 2017-02-10 11:28:10 -05:00
7392943e3d Properly adjust terrain graphics in special nodes when porting
This also fixes two instances of unadjusted graphics in the scenarios
2017-02-10 10:24:32 -05:00
58ec38926e Move old icons to legacy directory 2017-02-10 10:03:39 -05:00
20ff735d2f Add a Vahnatai PC graphic by "Kelyar-Ihrno" 2017-02-08 16:58:31 -05:00
ae02ac4793 Fix bottom buttons not working in fullscreen mode
Fixes #50
2017-02-08 11:01:39 -05:00
92ba1e0fb0 Fix "Center" text positioning, and replace it with context-sensitive tooltips 2017-02-07 22:24:28 -05:00
6b857e6e43 Fix some isses with editing outdoor encounters 2017-02-07 22:17:58 -05:00
bc810f9238 Fix warning message when setting a node that doesn't yet exist 2017-02-07 20:09:42 -05:00
61816b7529 Fix inability to set special nodes outdoors 2017-02-07 20:09:15 -05:00
ed0c41c3ce Fix misleading error message for validating unsigned fields 2017-02-07 20:08:53 -05:00
b6f16180c7 Fix erroneous create/edit string button for generic lever node 2017-02-07 20:08:28 -05:00
f520e1ac0a Fix issues with editing dialog text
- If there were no strings following the assigned six dialog strings, the scenario editor thought the string was out of range and tried to assign a new set
- Whenever the text is edited, make sure all six strings still exist.
2017-02-02 11:44:09 -05:00
933f7e7644 Add special spot to the list of field graphics 2017-02-02 11:35:45 -05:00
583a0ab68b Fix graphic selection dialog for certain types
This prevents problems when the ID of the graphic does not correspond to
its position in the graphics selection dialog.
2017-02-02 11:34:18 -05:00
f490464249 Make scenario editor not delete all trailing empty strings when saving 2017-02-02 11:32:53 -05:00
8520030f72 Propagate various BoEB fixes & tweaks to the scenarios 2017-02-01 22:17:11 -05:00
28d365ccfd BoEB: Some minor terrain fixes
- Basalt secret door no longer turns into a normal door when discovered
- Brazier now has a light radius
2017-02-01 21:59:09 -05:00