1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Commit Graph

6100 Commits

Author SHA1 Message Date
Sijmen Schoon
47d69998e7 Straighten up window_loadsave_widgets 2016-07-07 11:50:06 +02:00
Sijmen Schoon
127d94d451 Add a default button to the loadsave window 2016-07-07 11:29:22 +02:00
Ted John
6a5ecf04de Merge pull request #3998 from gDanix/fix-3324
Fix #3324: Opening tile inspector then footpath closes both windows.
2016-07-06 20:59:54 +01:00
Ted John
f866e6fac2 Merge pull request #3997 from SijmenSchoon/develop
Remember previous save/load location
2016-07-06 20:53:27 +01:00
Daniel Trujillo
966fbe812c Refactorize "update" callback to match coding standards. 2016-07-06 19:33:12 +02:00
Daniel Trujillo
2ea8ab1441 Fix #3324
This commit fixes a bug involving tool windows being closed when the
tile inspector was opened. This was caused by calling tool_cancel()
from wrong places, causing all tool windows being closed.
2016-07-06 19:26:14 +02:00
Sijmen Schoon
e882bfe736 Change strdup to _strdup 2016-07-06 18:50:30 +02:00
Sijmen Schoon
fcf4008395 Remember previous save/load location
Works for games, landscapes, scenarios and tracks (but this is commented out due to tracks not being separated or something?)
2016-07-06 18:22:08 +02:00
Charles Cook
8b36e4c54a Use four spaces instead of tabs in c++ 2016-07-05 20:32:37 -04:00
Charles Cook
6d268099f5 Follow coding standard for project. 2016-07-05 19:40:20 -04:00
Charles Cook
5c9110b99a Prevent viewport_invalidate from causing covered viewports to redraw and cache window and viewport visibility. 2016-07-05 18:02:23 -04:00
Charles Cook
19d873fedf Prevent rendering of hidden windows. 2016-07-05 12:54:28 -04:00
Michał Janiszewski
f3786b3130 Fix #3899: Game crashes after hosting my server
Catch exceptions when loading groups.json.
2016-07-04 17:50:09 +01:00
Sven Slootweg
b343db3948 Fix incorrect variable name in posix.c log statement (#3980) 2016-07-03 22:20:36 +02:00
Daniel Trujillo Viedma
3122448b86 Fix #3969: Custom currency's gets reset when closing the game
Custom currency loading code was being called from a not usually reached
place.
2016-07-02 16:46:49 +01:00
Daniel Trujillo
3745d3fa95 Remove unused include 2016-07-02 12:14:01 +02:00
Daniel Trujillo
1fc75131a4 Move call to load custom currency preferences to config_open_default() 2016-07-02 12:12:44 +02:00
Daniel Trujillo
a29db378eb Move loading custom currency-related preferences code into currency.c 2016-07-01 23:52:33 +02:00
Daniel Trujillo
4ebcf80a1a Redefine what is a "large" currency.
Decimals currencies does make sense when 10 < rate < 100, so it's
neccesary to raise the limit before hiding decimals
2016-07-01 22:02:28 +02:00
Daniel Trujillo
fc6f4929b7 Refactor for compliance with coding standards. 2016-07-01 22:02:28 +02:00
Daniel Trujillo
f61da89410 Delete useless 'invalidate' function. 2016-07-01 22:02:28 +02:00
Daniel Trujillo
036b09d916 Several fixes.
· Delete 1 remaining useless comment
 · Move static function definitions above window events definition
 · Replaced 'invalidate' function with window_invalidate_all()
2016-07-01 22:02:28 +02:00
Daniel Trujillo
6a3210b7b7 Remove useless comments. 2016-07-01 22:02:28 +02:00
Daniel Trujillo
dfd78ec359 Perform a refactor for compliance with conding style. 2016-07-01 22:02:28 +02:00
Daniel Trujillo
cb1f9269a6 Hide useless decimals in custom currency configuration window 2016-07-01 22:02:28 +02:00
Daniel Trujillo
a17061cfb6 Set default custom currency rate to 10, as GBP 2016-07-01 22:02:28 +02:00
Daniel Trujillo
6ce4584842 Fix the currency equivalence bug
The custom currency configuration window was showing an incorrectly
equivalence ratio between GBP and the custom currency.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
8ef1e1669d Add a missing include.
That was preventing from building on OSX and Win
2016-07-01 22:02:28 +02:00
Daniel Trujillo
4a28f7f6aa Clean code in custom_currency.c
To make it more OpenRCT coding style compliant
2016-07-01 22:02:28 +02:00
Daniel Trujillo
b12e5443e9 Add configuration support for the custom currency
This commit do several things:
 · Add proper entries to config.c file
 · Load custom currency definition at start time
 · Save every change made from the custom currency configuration window
2016-07-01 22:02:28 +02:00
Daniel Trujillo
71a32a8750 Create custom currency configuration window 2016-07-01 22:02:28 +02:00
Daniel Trujillo
5302ebd951 Revert "Add other-than-selected currency support to format_currency_2dp"
This reverts commit 98d5b332bd9958296218a66e2eb7ef61600c8086.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
140b4f73aa Add other-than-selected currency support to format_currency_2dp
This commit adds support for formatting currency strings using other
than the selected currency.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
187499fd72 Fix currency dropdown not showing checked custom currency.
Due to the dropdown separator before custom currency entry, the selected
item index was incorrectly assigned to the separator.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
9355eef5d4 Add custom currency option
Add custom currency entry to the dropdown menu of the options window
2016-07-01 22:02:28 +02:00
Daniel Trujillo
7d53b065dd Add custom currency
Add the corresponding entry inside CurrencyDescriptors array, and made
it
non-const to let the rate and other properties to change.

Also, a language string (STR_5880, en-GB & es-ES) has been added.
2016-07-01 22:02:28 +02:00
Duncan
5fb99b037f Merge pull request #3893 from wolfreak99/ObjectSelectionFilters
Filter Object Selection Window by "Selected only" and "Non-selected only"
2016-06-27 21:07:57 +02:00
wolfreak99
f9f0df82e5 refactor dropdown index to enum 2016-06-27 13:32:43 -04:00
Michał Janiszewski
42d6c8de4f Define NO_RCT2 for non-x86 platforms 2016-06-24 23:25:40 +02:00
Michał Janiszewski
35676d31f7 Integrate path variables used by game 2016-06-24 23:25:40 +02:00
Michał Janiszewski
199d0f03d8 Integrate some scenario variables
gScenarioTicks is still being used in some of native code
2016-06-24 23:25:40 +02:00
Michał Janiszewski
761fdfb7c0 Integrate gTotalNoImages 2016-06-24 23:25:40 +02:00
Michał Janiszewski
6c28df8250 Integrate gTypeToRideEntryIndexMap 2016-06-24 23:25:40 +02:00
Ted John
b1eb071b64 print NO_RCT2 flag in version info for binary confidence 2016-06-24 23:25:40 +02:00
Ted John
d9bcf2d946 remove RCT2 memory checksum for Win32 NO_RCT2 2016-06-24 23:25:40 +02:00
Michał Janiszewski
683eee827e Refactor gX.dat loading, make sure g2.dat loads too 2016-06-24 23:25:40 +02:00
Michał Janiszewski
1d0a9f212d Make config_apply_to_old_addresses empty for NO_RCT2 2016-06-24 23:25:40 +02:00
Michał Janiszewski
5e30733993 revert fixes 2016-06-24 22:40:37 +02:00
Michał Janiszewski
dfa482b1b5 Revert "Merge pull request #3897 from janisozaur/rebase-no-rct2"
This reverts commit 22c0cc92e6, reversing
changes made to 7b421c8052.
2016-06-24 22:40:37 +02:00
Michał Janiszewski
fbd4c8be49 Revert "Merge pull request #3930 from janisozaur/fix-3923"
This reverts commit 9f2f7c6b68, reversing
changes made to 27b74dff72.
2016-06-24 22:40:37 +02:00