1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Commit Graph

122 Commits

Author SHA1 Message Date
Ted John
b58766aa3f clean up the logo and make it scalable
- fixes #1776: graphical glitches on intro
- fixes #708: screen turns white when resizing intro
2016-05-13 21:36:07 +01:00
janisozaur
deeafc5a60 Add --silent-breakpad switch, fixes #3535 (#3544) 2016-05-11 12:25:21 +01:00
Ted John
d2c5501eea refactor sprite heads and counts 2016-05-09 00:08:03 +01:00
janisozaur
68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Ted John
4cdb2df9dc integrate screen variables 2016-04-23 11:16:46 +01:00
Yaroslav Tretyakov
c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
IntelOrca
51a7e3f278 clean up and refactor the crash handler 2016-04-10 01:00:31 +02:00
Michał Janiszewski
17bc485fb5 Breakpad for windows
This enables breakpad Windows support **only**.

The scope of this was limited to allow for inclusion into 0.0.4 release.
Breakpad for now is a Windows-only functionality, as this platform has
largest audience and is the only one that has no system-provided stack
tracing utility.

Upon crash, breakpad will try to create a dump and save current game,
present user with some vital information, then open explorer on the
created files for user convenience, asking him/her to create a new
issue with OpenRCT2 on Github.
2016-04-09 18:57:14 +02:00
Michał Janiszewski
e28de49a34 Breakpad integration
Provide your own breakpad and point cmake at it.

git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
mkdir breakpad && cd breakpad
../depot_tools/fetch breakpad # edit the script to use python2
cd src
LDFLAGS="-m32" CXXFLAGS="-m32" CFLAGS="-m32" CPPFLAGS="-m32" ./configure
LDFLAGS="-m32" CXXFLAGS="-m32" CFLAGS="-m32" CPPFLAGS="-m32" make -j 8

Run cmake on openrct2:
cd openrct2
vim CMakeLists.txt # provide your path to breakpad
mkdir build && cd build
cmake ../ -DWITH_BREAKPAD=ON
make -j 8
./openrct2 # open a game, select "about openrct2", crash
2016-04-09 18:57:14 +02:00
IntelOrca
a99a2f0cf4 fix command line hosting of scenario files 2016-03-05 12:20:02 +00:00
IntelOrca
38fda5debf remove old redundant RCT2 platform code 2016-02-16 20:23:32 +00:00
Michał Janiszewski
4aac5c035f Don't do uncapped FPS when running headlessly 2016-02-15 10:41:09 +01:00
IntelOrca
caf9bd9939 get game working with new theme manager
Theme editor currently unavailable.
2016-02-03 18:23:44 +00:00
robin clemens
6db4536da9 1. Added --password=<str> to headless server mode to configure a password.
2. added default_password under [network] to configure a default password for headless server mode
2016-01-23 21:53:02 +00:00
LRFLEW
58d258038f Improve security on OSX and Linux 2016-01-22 16:44:08 -07:00
Michał Janiszewski
3bf1e0e06d Rename safe_strncpy to safe_strcpy 2016-01-18 20:49:52 +01:00
Michał Janiszewski
7dae861dab Unload all objects on dispose to stop memory leaks 2016-01-15 16:37:27 +01:00
Michał Janiszewski
ab3d2a1ad9 Release config on closing to limit leaked memory 2016-01-15 14:55:36 +01:00
IntelOrca
cdee534eb1 use SDL2's platform defines to normalise platform guards 2016-01-14 20:12:43 +00:00
Michał Janiszewski
1e5f59df29 Drop number from build ID. 2016-01-13 14:33:19 +01:00
IntelOrca
8cf53c12af add ability to set RCT2 path by command line 2016-01-12 23:10:18 +00:00
Michał Janiszewski
54f7f93ab9 Make sure config.ini gets created
This commit makes sure config.ini gets created even when RCT2 path is
not selected.

This makes for a better out-of-box experience on Linux, where no
directory selector is provided yet, as we provide default config file
and state in the error message how to fix it.
2016-01-11 22:46:29 +01:00
IntelOrca
e9d222fdd3 new-argparse: finish new argparse integration and clean up 2016-01-10 22:50:31 +00:00
IntelOrca
3f0073f29c new-argparse: implement most of the root commands, fix issues 2016-01-10 22:50:30 +00:00
Michał Janiszewski
17e5a0d356 Use strndup when setting last_run_version
gConfigGeneral.last_run_version should have the string value copied to,
otherwise the SafeFree in config_set_property could try freeing value
from stack if used.
2016-01-02 00:11:34 +01:00
IntelOrca
3b5768f5bc print '(debug)' to version string when build in debug configuration 2015-12-26 17:23:27 +00:00
Michał Janiszewski
ea6fa2c82a Let user specify the data dir as cmdline option.
This adds --openrct-data-dir=<str> option to command line letting user
select where he wants OpenRCT2-specific data to be. By default the
search locations are:
* <exePath>/data (on all platforms)
* /var/lib/openrct2 (on Linux)
* /usr/share/openrct2 (on Linux)
2015-12-19 00:06:41 +01:00
Michał Janiszewski
7d132d8fe1 Extract and embed sections into binary itself
Fixed some CMakeLists.txt problems, made another target for converting
section images into something palatable by ld, modified the linker
script to place these ssection at predefined VMAs and updated openrct2.c
with new checks.
2015-12-16 19:16:27 +01:00
Duncan
0a86b8c946 Merge pull request #2450 from janisozaur/mmap
POSIX: MAP_ANONYMOUS should have fd = -1
2015-12-12 08:23:50 +00:00
LRFLEW
c9be2e1bc9 Resolved struct packing error and crash on OS X 2015-12-10 17:29:58 -06:00
Kyle Kirbatski
af382b1884 Switched to -sectcreate instead of mmap on OS X 2015-12-10 16:32:46 -06:00
Michał Janiszewski
1bafbde113 Shift segments in Mach-O to outside of required AS
Mach-O defaults to having .text segment starting at 0x1000 RVA, which
clashes with the address space required for mmap to work properly.

This change tells linker to move the segment outside of required AS, and
then some, so that mmap can properly allocate required addresses without
evicting anything else.
2015-12-10 16:32:45 -06:00
duncanspumpkin
ce56b2c7f7 Aligned hook for better OS X support 2015-12-10 16:31:41 -06:00
Michał Janiszewski
3d0fcc948d POSIX: use mincore to detect impending doom
Call to mmap (or next malloc) will likely fail if there are already
mapped pages within the region we want to map ourselves. Using mincore
we can detect if such pages exist and warn user about what's going to
happen.
2015-12-09 00:57:42 +01:00
Michał Janiszewski
8f82e5013a POSIX: MAP_ANONYMOUS should have fd = -1 2015-12-08 23:30:55 +01:00
Michał Janiszewski
d1b6d175c7 Make each platform set its own exe path 2015-12-01 21:38:35 +01:00
Michał Janiszewski
b4b1624e08 Set path properly for OS X 2015-11-29 15:29:35 +01:00
Michał Janiszewski
39cc16d137 Plug memory leaks, check memory accesses 2015-11-29 12:15:47 +01:00
Ted John
c63eef9a21 Merge pull request #2378 from IntelOrca/support-unicode-currencies
support unicode currencies with ascii fallback
2015-11-27 17:56:44 +00:00
Linus Unnebäck
30b6718532 start of OS X support 2015-11-27 17:43:12 +01:00
IntelOrca
7ea0e2d6a3 improve language load fail behaviour
improve currencies
fix bug in supported glyph check
2015-11-26 18:28:52 +00:00
Dom Light
e9b7e41635 Refactor audio_sound_play_planned 2015-11-17 23:05:24 +00:00
Dom Light
b736de003e Sanitize audio.c 2015-11-17 01:05:21 +00:00
Dom Light
3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
Michał Janiszewski
1bd665563b Improve memory setup for Linux
DATASEG was mapped, but did not have its contents filled properly. It is
now done as the process expects it.

Extend memory checksum region to catch possible corruptions early.

Fixes #2063
2015-11-09 22:11:46 +01:00
IntelOrca
e1b67eeda0 improve command line version information and add headless check 2015-11-08 12:49:19 +00:00
Ted John
7366c87e2c Merge pull request #2196 from IntelOrca/custom-user-data-path
Allow user data path to be specified by command line
2015-11-06 18:35:38 +00:00
Michał Janiszewski
2d62c356c3 Early out and report error if langauge files are missing
This is a common problem if you don't set up your paths properly on
Linux, so be nice and try to provide helpful message why we failed to
load instead of crashing on user a moment later.
2015-11-05 22:41:20 +01:00
IntelOrca
e177be305b allow user data path to be specified by command line, closes #2182
Also changed default path under linux to be ~/.config/OpenRCT2.
2015-11-03 22:20:35 +00:00
duncanspumpkin
eaffec651c Fix #2178. Failure to load a scenario no longer causes intro to be playable. 2015-11-02 19:45:18 +00:00