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

4632 Commits

Author SHA1 Message Date
Duncan
5b9a98a0f9 Merge pull request #2588 from HaasJona/refactor2
Refactor peep code
2016-01-01 22:22:18 +00:00
Hielke Morsink
560a435748 Drawing checkmarks for set flags 2016-01-01 21:29:10 +01:00
Hielke Morsink
829c3a3339 Added correct tooltips for moving up/down buttons. 2016-01-01 21:29:09 +01:00
Hielke Morsink
bf7e45939a Pixel correct paddings for list and column headers 2016-01-01 21:29:08 +01:00
Hielke Morsink
ae4ff5fc6c Redesigned UI to be more consistent with the ride/staff windows. 2016-01-01 21:29:07 +01:00
Hielke Morsink
a1f506df58 Fix all buttons after deleting a map element. 2016-01-01 21:29:06 +01:00
Hielke Morsink
2b7a88297f Moved some UI elements and changed default size. Updated changelog. 2016-01-01 21:29:05 +01:00
Hielke Morsink
05e807a9ca Displayng ride type for tracks 2016-01-01 21:29:04 +01:00
Hielke Morsink
389249abfd Better UI spacing. 2016-01-01 21:29:03 +01:00
Hielke Morsink
6f824c9c2e Resolved warnings. 2016-01-01 21:29:02 +01:00
Hielke Morsink
38867b7462 Fixed old typo in string ID name. 2016-01-01 21:29:00 +01:00
Hielke Morsink
64312957a0 Added column headers instead of labels, and added columns for the flags. 2016-01-01 21:28:59 +01:00
Hielke Morsink
db270d85c2 automatically en/disabling buttons when needed. Selecting corrupt element when added. 2016-01-01 21:28:58 +01:00
Hielke Morsink
2a3aefdb4e fixed list issue after removing element. 2016-01-01 21:28:57 +01:00
Hielke Morsink
d226012d94 Function to remove elements using the tile inspector. 2016-01-01 21:28:56 +01:00
Hielke Morsink
d68ed36147 Recreated UI for tile inspector. Added swap functionality. 2016-01-01 21:28:55 +01:00
Hielke Morsink
35bf18bcb6 Added empty button that swaps the top two map elements 2016-01-01 21:28:54 +01:00
Hielke Morsink
f04c97fbc1 Getting path scenery type and index using helper functions throughout the entire project. 2016-01-01 21:28:53 +01:00
Hielke Morsink
6f0d14b65f Using ghost helper funcitons for getting and setting the bit now. 2016-01-01 21:28:52 +01:00
Hielke Morsink
b82504c5e4 Better consistensy with already existing helper functions 2016-01-01 21:28:51 +01:00
Hielke Morsink
370c08f796 Added comments to path info 2016-01-01 21:28:50 +01:00
Hielke Morsink
955bf7b26f Displaying more path info for queue. Added some helper functions. 2016-01-01 21:28:49 +01:00
Hielke Morsink
855e122b55 Printing path and addition names in tile inspector. 2016-01-01 21:28:48 +01:00
Jonathan Haas
4d26e4c4a1 Refactor peep code
Name various fields and constants related to peeps. This includes:
  - Flags for flashing peeps in map window
  - Animation frames for picked up peeps
  - Function checking if peep should start to fall
  - Special sprite handling for slide boards and lawn mowers
  - Created array for peep sprite entries, renamed some variables and constants
2015-12-31 13:57:06 +01:00
Michał Janiszewski
8a5d066efe Fix strict aliasing violations
Compiler only guarantees proper accesses to variables when using
variable's native type or `char` (i.e. single byte type) [1].

This commit fixes violations of this rule. In most cases changing code
to a simple cast was enough, some required a bit deeper modifications.

This fixes #2596.

[1] http://blog.qt.io/blog/2011/06/10/type-punning-and-strict-aliasing/
2015-12-31 13:27:26 +01:00
Michał Janiszewski
5f66cd48f8 Merge branch 'develop' into vehicle-update
Conflicts:
	openrct2.vcxproj.filters
2015-12-31 11:41:23 +01:00
duncanspumpkin
1f4b4b2c3f Fix flying boats when entering the station.
Issue was caused by not clearing the word var_34 but instead only the byte var_34. This caused track_progress (word var_34) to become a very large negative number that would be interpreted as a valid track_progress. This would eventually end up reading invalid memory.
2015-12-31 10:27:33 +00:00
duncanspumpkin
3e03ab71fa Fix small bugs in boat hire code. 2015-12-31 09:53:23 +00:00
Duncan
9884ad416e Merge pull request #2593 from xiane/develop
Applied enum value to ride type flags.
2015-12-30 18:54:23 +00:00
Ian Spence
ae7da3e830 Fix #2550 Program crashes when executing "exit" command from the console
- exit and quit commands are aliased to "hide"
 - value of the command was being set to a constant value and could not be freed
 - updated command value to use a freeable value
2015-12-30 08:57:43 -08:00
IntelOrca
68a600f679 finish converting last lodepng calls to libpng 2015-12-30 13:36:14 +00:00
IntelOrca
cabd0fdc3a use image_io_png_write in cmdline_sprite 2015-12-30 13:36:14 +00:00
IntelOrca
00e5c4418d refactor image IO to new source file 2015-12-30 13:36:09 +00:00
Michał Janiszewski
9321c53b87 Enable libpng on Linux builds
Lodepng is still available.
2015-12-30 13:34:51 +00:00
IntelOrca
8ae43fd0ff use libpng for screenshots 2015-12-30 13:34:51 +00:00
sangch.go
fce5eab9d8 Refactored code. bugfix and more define. 2015-12-30 17:13:00 +09:00
sangch.go
94d5eb86c8 Applied enum value to ride type flags. 2015-12-30 13:56:56 +09:00
Alex Bahm
2c7f0d6ae2 Improved mechanic selection for broken rides
Switch to using manhattan distance to calculate distance. Also changed
starting closestDistance to UINT_MAX and removed ternary check because it is not needed.
2015-12-29 13:51:30 -08:00
Michał Janiszewski
36de7a9027 Fix warnings
Some off-by-one errors, truncation warning fix, main() in posix.c no
longer a stub.
2015-12-29 16:09:36 +01:00
duncanspumpkin
ac0d729baf implement sub_6DA280 2015-12-29 12:06:11 +00:00
IntelOrca
64b589770a remove obsolete callprocs 2015-12-29 11:57:47 +00:00
IntelOrca
c6b023df86 fix warnings 2015-12-29 11:39:06 +00:00
Ted John
69f0e9d55d Merge pull request #2398 from Broxzier/comments_and_optimizations
Refactored some util functions and some minor tweaks for saving tracks
2015-12-29 11:31:58 +00:00
Michał Janiszewski
bcfdbbd25b Minor fixes for mapgen 2015-12-29 12:03:38 +01:00
IntelOrca
292ce3b103 don't show IP address when hovering over servers for basic security 2015-12-29 01:01:26 +00:00
IntelOrca
43b31c25a1 use sprite constants for tab animations 2015-12-28 19:44:43 +00:00
IntelOrca
08d47e26a7 improve player list
- animate tab
- show number of players
2015-12-28 19:44:43 +00:00
Ted John
f83d60e30d Merge pull request #2573 from janisozaur/cmake-mingw
Fix CMakeLists for MinGW cross-compilation
2015-12-28 19:01:30 +00:00
IntelOrca
1a5c5a5017 fix #2577: interest rate can be set to -1 and no protection from erroneous values 2015-12-28 18:43:11 +00:00
Michał Janiszewski
6a5fc90cd4 Fix CMakeLists for MinGW cross-compilation
This makes sure that shared library built with MinGW toolchain is linked
statically to *all* its dependencies, including libc, libstdc++, libsdl2
and all the others. This allows producing of working `openrct2.dll` by
cross-compiling.

I hit a bug with libcrypto, a dependency of libssl, which in turn is a
dependency of curl, which creates a `DllMain` entrypoint for static lib
too, but since we don't do anything in ours, this should be safe.

I have only had chance to try it out when cross-compiling, ideally it
should be tested under Cygwin/MSYS too, but it is too bothersome to
setup for me.
2015-12-28 01:17:28 +01:00