1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Commit Graph

48 Commits

Author SHA1 Message Date
Patrick Wijnings
81163506e9 Merge remote-tracking branch 'IntelOrca/master'
Conflicts:
	src/game.c
	src/park.h
2014-08-30 15:18:31 +02:00
Patrick Wijnings
5e96da6634 Fix definition of PARK_FLAGS_NO_MONEY flag and clean up related code. 2014-08-30 15:11:19 +02:00
qcz
bd06c7caee Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
Duncan Frost
b98d4bb508 Viewport integrated into gfx_draw_sprite. 2014-08-10 11:11:43 +01:00
Duncan Frost
d68e716cd8 Removed compile errors. Implemented changes to window.h 2014-07-23 18:07:38 +01:00
Duncan Frost
5232fc378b Trying to use the gfx wrap functions. 2014-07-13 12:24:27 +01:00
Duncan Frost
fbd4476a5f Fix issue in non MSC_VER 2014-07-07 19:10:04 +01:00
Duncan Frost
b383280c3c Fixed bottom toolbar tooltip issues. Fixes #196 2014-07-07 19:07:46 +01:00
IntelOrca
65e579045c show full date in bottom right panel 2014-05-27 21:28:16 +01:00
IntelOrca
092764ea6b separate marketing and add finances window 2014-05-25 23:17:55 +01:00
anyc
95a56b1d1e make code compatible with mingw64 2014-05-22 23:47:23 +02:00
anyc
d34e2db9e1 added GCC/MinGW-compatible assembler 2014-05-22 23:47:18 +02:00
anyc
e6c90c6ebb fixed static enums; added missing headers 2014-05-20 17:55:39 +02:00
anyc
82fa4439bf renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
adrian17
31424b6a06 Use macros defined in addresses.h where possible. Removed one doubled macro. 2014-05-13 23:37:45 +02:00
adrian17
0e02787bf3 Prefer the RCT2_GLOBAL macro 2014-05-12 22:03:24 +02:00
ddevrien
df97c22dae some strings added 2014-05-12 16:56:28 +02:00
IntelOrca
7c6a193b42 remove all remaining warnings 2014-05-12 02:18:08 +01:00
ZedThree
85b102c5b0 Change NEWS_ITEM_SCENERY to NEWS_ITEM_RESEARCH 2014-05-08 17:53:57 +02:00
ZedThree
c1ac6edb96 Add function to open park window to guests tab 2014-05-08 17:35:32 +02:00
ZedThree
c94fd53022 Add news_item_open_subject() 2014-05-08 17:14:08 +02:00
ZedThree
a35289fc9f Add functions to open park window to awards/rating
Also update replace some address that have constants/functions
2014-05-08 17:11:26 +02:00
IntelOrca
00cd901441 add news window 2014-05-04 14:10:32 +01:00
IntelOrca
30a5793ac1 rename current day to current month ticks 2014-05-03 14:35:07 +02:00
ddevrien
9cf6f8f98a Added some GAME_FLAGS
Also renamed them to PARK_FLAGS and moved them to park.h, since they
have to do with each park, and are probably saved somewhere in the sv6
file.
2014-05-03 13:39:36 +02:00
Matthias Lanzinger
66f7a0bcdc Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/rct2.h
	src/window_game_bottom_toolbar.c
2014-05-01 22:30:44 +02:00
IntelOrca
7de26e9931 rename current day to current month ticks 2014-05-01 16:55:42 +01:00
ZedThree
1e9d9c1887 Change peep news item enum names 2014-05-01 13:23:18 +02:00
ZedThree
ecc51e2f4b Fix finding peep on ride news items
Peep's current_* variables were offset by 1. Also fixed comparison
between 32-bit and 16-bit ints.
2014-05-01 13:16:41 +02:00
Matthias Lanzinger
c7db7c6013 Merge remote-tracking branch 'upstream/master' 2014-05-01 11:50:09 +02:00
Matthias Lanzinger
9f321fa339 Identified peep.staff_type and days_in_month table. 2014-04-29 22:51:51 +02:00
Peter Hill
2d69f50444 Define named constant for null sprite locations 2014-04-29 18:40:06 +02:00
IntelOrca
a325bcc856 define next climate variables, all refs rewritten 2014-04-29 12:35:37 +01:00
IntelOrca
1dcfdbe355 refactor climate 2014-04-29 12:18:50 +01:00
Matthias Lanzinger
702674f13e Merge remote-tracking branch 'upstream/master' into update_climate 2014-04-29 12:42:49 +02:00
ZedThree
6f756bb458 Replace variable addresses with named constants
Done automatically with sed/unix
2014-04-28 22:00:54 +02:00
Matthias Lanzinger
b7ae1c7266 Slight climate refactoring 2014-04-28 20:39:10 +02:00
Matthias Lanzinger
573929fee9 Identified full weather data table.
Restructured weather data properly and made window_game_bottom_toolbar use
our table.
Used determine_future_weather in climate_reset.
2014-04-28 19:59:40 +02:00
Matthias Lanzinger
035fa16fc3 Crude start of a decompiled update_climate() 2014-04-27 23:46:18 +02:00
IntelOrca
b8f5385050 add additional authors in source code headers 2014-04-27 20:21:55 +01:00
Peter Hill
746000f0cd Replace call by address with function name
Call news_item_get_subject_location by name rather than its address.
Also add short description of function
2014-04-27 20:27:12 +02:00
IntelOrca
eaec44e896 refactor window flags 2014-04-24 20:26:05 +01:00
Kevin Burke
41358c734a Replace address references with named constant 2014-04-21 15:00:18 +05:30
Kevin Burke
e5a925e26c Add newlines to the end of every file (sed/unix do this) 2014-04-21 14:57:48 +05:30
IntelOrca
eba4b6da9d add other pages to park window 2014-04-16 02:05:49 +01:00
IntelOrca
03db7f5bc0 anchor bottom toolbar to window width 2014-04-15 02:36:58 +01:00
IntelOrca
8cbe0e7aa1 add more drawing of bottom toolbar 2014-04-11 17:38:15 +01:00
IntelOrca
5cb1600417 add bottom toolbar 2014-04-11 03:58:17 +01:00