Commit Graph

850 Commits

Author SHA1 Message Date
4fdd330d07 Setting up Apple Events needs to be done early in initialization, otherwise the event will time out and the Finder will show an error that the program doesn't know how to open the saved gane. 2020-01-12 17:36:16 -05:00
44f18420bd Remove the init thread
It seems to cause problems on Linux and no benefit of it could be observed on Windows or Mac
2020-01-12 17:29:40 -05:00
fb28a4da2e Fix Mac build 2020-01-12 13:19:32 -05:00
6ae8a313b5 Fix "Quit" and red button appearing over the credits when you click them
Fixes #205
2019-12-30 01:35:54 -05:00
5ca27fdad5 Fix items that cause a status effect or cast a spell 2019-12-29 14:11:19 -05:00
7233a8ba78 Change obsolete How to Order button to Preferences
This will allow Linux users to access the preferences UI while I work out how to implement menus on Linux
2019-12-29 13:29:58 -05:00
d12fd43d15 Fix the save action
- Prompt for filename if the game has never been saved
- Don't say the game was saved if file choice was cancelled (affects save as too)
2019-12-29 13:09:55 -05:00
6f96222c37 Remove the 30-item limit in shops 2019-12-02 01:16:34 -05:00
3e6d3b9d5e Fix shop scrollbar not appearing if there are 9 items (when only 8 fit) 2019-11-24 20:28:53 -05:00
761af9d60f Fix showing wrong buttons in the item list 2019-11-24 20:28:53 -05:00
ab740370ee Fix some potential uninitialized variable accesses 2019-11-24 20:28:53 -05:00
b8689511cd Use -1 instead of 120 to mark an invalid location. 2019-11-24 20:28:53 -05:00
8392ee85e8 Make more use of references to shorten long lines of code
This goes through just four files for unnecessary uses of univ.party[n].
2019-11-24 20:28:53 -05:00
3302dd68b7 Move encumbrance calculation functions into cPlayer 2019-11-24 20:28:53 -05:00
060be4dd42 Remove some extern data declarations that didn't exist anymore (and weren't used) 2019-11-24 20:28:52 -05:00
5ea29710f0 Minor code cleanup 2019-11-24 20:28:52 -05:00
dc25cf6ffb Move abil_chart to be private to cItem and fix missing entries for summoning and quickfire abilities 2019-11-24 20:28:52 -05:00
4f785e2650 Use enums for most of the rest of the game constants.
This adds an "enum map" type that allows safe usage of an enum to index an array.
(That is, it enforces that the index is of the enum type.)
2019-11-24 20:28:52 -05:00
4ad85936d3 Fix use of a static bitset to record whether items (in a dynamic vector) have been taken 2019-11-23 12:31:30 -05:00
9073063423 Merge branch 'merge_linux' of https://github.com/murlock/cboe 2018-03-03 17:52:59 -05:00
Mark Clark
e70c360e11 Minor fixes to get build working for vs2017 project; 2018-02-25 14:55:13 -05:00
8759aad90a Move Xcode project to a separate tree parallel to src 2018-02-19 02:11:29 -05:00
03c19fa7ec Use the new erase_completed_specials() function for towns too 2018-02-17 18:46:53 -05:00
e9490ac9d1 Rename a function 2018-02-17 18:45:45 -05:00
1d5e0c2e1e Formatting 2018-02-17 18:14:38 -05:00
Mark Clark
b7d62067cc Fixed issue where special could attempt accessing index outside range for specials; 2018-02-17 17:15:10 -05:00
Mark Clark
a2dc641f31 Refactored erase_out_specials(); 2018-02-17 17:10:34 -05:00
Michael Bonfils
12c3ce26f8 Fix compilation of linux 2018-02-10 17:08:33 +01:00
Michael Bonfils
d940f2c39d Merge branch 'linux' into merge_linux 2018-02-08 20:36:46 +01:00
513d926032 Fix "Save" menu action not working (only "Save As" worked)
(thanks to Ir the Great for this patch)
2017-12-16 16:36:32 -05:00
3e2bf582de Fix priest spells menu showing mage spells instead
(thanks to Ir the Great for the Windows side of this patch)
2017-12-16 16:34:01 -05:00
84f44820f8 Fix out-of-bounds issue when drawing boats and horses
(thanks to Ir the Great for spotting this issue)
2017-12-16 14:44:07 -05:00
6866ff7a98 Fix out-of-bounds traits error on Anama trait
(thanks to Ir the Great for this patch)
2017-12-16 14:40:18 -05:00
e53056a132 Fix a couple of MSVC compiler warnings 2017-09-16 12:46:42 -04:00
477f6618fd fixup 3582a05 for non-Windows 2017-09-04 23:41:40 -04:00
3582a055e2 Fix Windows build 2017-09-04 23:32:50 -04:00
beadb49217 Fix scons build
Tested on Mac only, but probably also works on Windows/Linux
2017-09-04 20:45:45 -04:00
3828b03645 Implement UI scaling option
There are still a few minor visual glitches, but it works pretty well
2017-09-04 15:27:00 -04:00
bdb3cb3df6 Fix an issue with the help buttons for talking and shops not producing anything if you'd seen them once before 2017-09-04 14:37:26 -04:00
9c69e006d8 Refactor rendering to use an SFML view for placing the main UI within the overall interface 2017-09-04 14:36:55 -04:00
C.W. Betts
1b210d4358 OS X: Fix a few memory leaks. 2017-08-31 21:50:48 -04:00
7e7f3d2b81 Merge mac into windows 2017-08-27 23:37:37 -04:00
7987680bf4 Simplify some stuff with references 2017-04-15 02:04:11 -04:00
1f9615d185 Add an info structure for eItemType enum 2017-04-15 02:03:42 -04:00
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
e98f9381fe Move special node category into the node properties struct 2017-04-14 00:50:38 -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