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
4ad84e6cf8
Missed some when fixing #191
2018-04-07 09:38:13 -04:00
05c9936b48
fix #191
2018-04-06 21:02:01 -04:00
Rémi Verschelde
141cfab23c
Fix GCC build issue with ambiguous for loop iterator
...
Previous code would raise this error with GCC 5.5.0:
build/obj/scenario/monster.cpp:804:19: error: use of 'abil' before deduction of 'auto'
for(auto& abil : abil) {
^
I'd advise to do some further refactoring to prevent confusion between the public 'abil'
which is a map of two types of abilities, and the various local 'abil's that shadow it
in monster.cpp.
2018-04-05 11:13:58 +02:00
Michael D. Reiley
5a142a656a
Fix save filename newline bug on Linux
2018-03-23 17:39:13 -07:00
d1838991a8
This is an attempt to fix the Travis build errors due to mismatched virtual override signatures
2018-03-03 18:44:27 -05:00
ed402040c9
Fix the fix for Mac
2018-03-03 18:19:18 -05:00
ee0bfa835a
Fix merge errors
2018-03-03 18:05:05 -05:00
9073063423
Merge branch 'merge_linux' of https://github.com/murlock/cboe
2018-03-03 17:52:59 -05:00
Mark Clark
265f959ecf
Moved project;
2018-02-25 22:54:48 -05:00
282cc7b850
Fix VS2013 project
2018-02-25 15:48:09 -05:00
Mark Clark
e70c360e11
Minor fixes to get build working for vs2017 project;
2018-02-25 14:55:13 -05:00
e77d5194a3
Add a version directive to the shaders
2018-02-19 02:15:28 -05:00
8759aad90a
Move Xcode project to a separate tree parallel to src
2018-02-19 02:11:29 -05:00
827e1b2a6b
Fix crash when loading a saved game containing boats or horses
2018-02-18 17:33:12 -05:00
c21b0b8de7
Fix #155
2018-02-18 16:26:10 -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
5bc085facd
Ensure mathutil.hpp doesn't break in the presence of min/max macros
2018-02-12 23:36:30 -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
f3866861bb
Fix inability to duel-wield
...
(thanks to Ir the Great for this patch)
2017-12-16 16:51:27 -05:00
b0d2ca8e23
Fix possible crash on exiting scenario
...
(thanks to Ir the Great for this patch)
2017-12-16 16:37:59 -05: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
51c6bdd5ea
Minor scons improvements and fix an error in MinGW build
2017-09-16 22:36:43 -04:00
39f11dddb5
Fix scons+cl build
2017-09-16 13:12:36 -04:00
437b7127d8
Update NSI installer script to include the new-format scenarios,
...
instead of the old-format scenarios
2017-09-16 13:04:59 -04:00
0a98e62f14
Fix MSVC debug build
2017-09-16 12:54:04 -04:00
e53056a132
Fix a couple of MSVC compiler warnings
2017-09-16 12:46:42 -04:00
9127e4a03f
Enable building tests in MSVC 2013
2017-09-16 12:46:31 -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
4c135e57fa
Fix scenario editor build
2017-09-04 20:42:37 -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
e781653483
Xcode: cleanup the schemes and enable running "All"
2017-08-31 22:25:36 -04:00
