Commit Graph

1754 Commits

Author SHA1 Message Date
409fe41030 Ignore numpad keys for keyToChar conversion 2020-01-12 10:58:33 -05:00
479cfb75f6 Fix improper loading order with saved games 2020-01-02 00:28:52 -05:00
b6aee36a0c Write hidden/visible state for EVERY town in the save file, even if it's equal to the scenario default
This should fix #197 for any new saves created after the fix.
2019-12-30 01:48:00 -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
699e66a69c Remove obsolete failing test 2019-12-29 13:26:00 -05:00
402f4eae01 Fix saving for double preferences (UIScale) on Windows/Linux 2019-12-29 13:19:42 -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
1bd23ace69 Better detection of doubles in Windows/Linux preferences 2019-12-29 12:48:10 -05:00
45bbc12208 Linux builds require linking to pthread 2019-12-29 12:25:44 -05:00
13e61047d9 VoDT: Merge Bristow's shops into a single shop 2019-12-14 12:14:39 -05:00
7ba61508f2 Fix garbage text appearing with the game version 2019-12-02 01:16:55 -05:00
6f96222c37 Remove the 30-item limit in shops 2019-12-02 01:16:34 -05:00
fd8bd913cc Fix monsters killed in town not being initialized,
resulting in garbage values after loading a saved game
2019-12-01 14:36:14 -05:00
b8669ac04a Fix play_sound function interpreting -65535 as sound 1.
It now correctly treats it as a sound that doesn't exist,
and plays nothing.
2019-12-01 14:22:39 -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
1b1aba0bd5 VoDT: Merge some of the shops 2019-11-24 20:28:53 -05:00
6ca89a66a9 Fix items being unequipped sometimes when an item is picked up 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
0001f754ac Travis: Don't auto-update Homebrew on OSX builds 2019-11-23 12:46:07 -05:00
f80a294de4 Travis: Make OSX build use the oldest supported version 2019-11-23 12:43:35 -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
c1a3ff2a44 Add a landing page for the two documentation branches
(Not currently included in packaging.)
2018-06-24 12:56:17 -04:00
5be60ddda7 Merge pull request #190 from akien-mga/scons-gcc
SCons usability improvements and GCC support for posix
2018-04-07 13:18:03 -04:00
Rémi Verschelde
4dfa6c6b66 Travis: Add GCC build on Linux 2018-04-07 16:01:34 +02:00
Rémi Verschelde
de48ef1b3c SCons: Do not enforce clang on posix, allowing use of GCC
The compiler can now be defined with `scons CC=clang CXX=clang++`
and/or with the `CC` and `CXX` environment variables.

The build will pick the default C and C++ compilers of the user's
system, so probably GCC on most, and Clang and some of them (e.g. on
Travis which is configured to use Clang).

Also cleaned up unnecessary definitions which are already part of the
base environment, and removed the unnecessary (default on Linux) and
Clang-only -stdlib=libstdc++ definition (still needed on macOS).
2018-04-07 16:01:34 +02:00
Rémi Verschelde
539664ecd6 SCons: Use list in Append() to ensure proper argument spacing
Otherwise we can end up with `scons CXXFLAGS="some-arg"` giving
a `some-arg-std=c++11` argument when `-std=c++11` is Append()'ed.
2018-04-07 16:01:34 +02:00
Rémi Verschelde
3909d80360 SCons: Use Variables for command line option and help output
Also add options to configure the compilers for C and C++ (no C code yet
but C libraries may be added in the future, and we wouldn't to mix e.g.
gcc for C and clang++ for C++).
2018-04-07 16:01:34 +02:00
514a5dccc9 Xcode: Fix tests working directory 2018-04-07 10:01:08 -04:00
4e6d690de6 Xcode: Fix a couple more incorrect file paths 2018-04-07 09:52:43 -04:00
4ad84e6cf8 Missed some when fixing #191 2018-04-07 09:38:13 -04:00
b54ab46d7e XCode: Fix an incorrect path 2018-04-06 21:06:23 -04:00
05c9936b48 fix #191 2018-04-06 21:02:01 -04:00
5e4c92e7ad Merge pull request #189 from akien-mga/gcc-auto-iterator
Fix GCC build issue with ambiguous for loop iterator
2018-04-05 09:03:11 -04:00
f7c035c6b0 Merge pull request #188 from akien-mga/scons-warning
SCons: Fix warning on posix build
2018-04-05 09:01:50 -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
Rémi Verschelde
cb0054d68a SCons: Fix warning on posix build
`build/pkg/SConscript` only exists for darwin or for win32 when
makensis is available, so it should not be added inconditionally.
2018-04-05 10:10:03 +02:00
1d273b312e Merge pull request #186 from seisatsu/master
Fix save filename newline bug on Linux
2018-03-23 20:42:08 -04:00
Michael D. Reiley
5a142a656a Fix save filename newline bug on Linux 2018-03-23 17:39:13 -07:00
Michael Bonfils
69589afff7 Fix travis for Linux build
Several issues was detected with linux build:
- travis_wait raise timeout
- --jobs=2 sometimes fails
- add flag BOOST_NO_CXX11_SCOPED_ENUMS to fix compilation with old boost filesystme
- add missing tool xmllint
2018-03-11 12:07:20 -04: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