mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,440 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

228 Commits

Author SHA1 Message Date
Ted John 25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00
Broxzier 6c29bdbf21 CppCheck fixes 2016-12-24 13:10:03 +01:00
Ted John c5899139d7 Move scenario sources to sub directory 2016-12-16 01:25:05 +00:00
Ted John abc3835d7b Rename openrct2.c h to OpenRCT2.c h 2016-12-14 00:32:06 +00:00
Michał Janiszewski 29a4277709 Refactor sawyercoding 2016-11-28 09:59:01 +00:00
Michał Janiszewski 3f7fd56328 Remove trailing whitespace in sources 2016-11-13 20:32:55 +01:00
Michał Janiszewski 00dd35481e Remove unused enum from network.cpp 2016-11-13 19:36:03 +01:00
Michał Janiszewski b30454366f Add note about possible improvement of object sending 
[ci skip]
 2016-11-11 18:38:23 +01:00
Michał Janiszewski 0793b3bc11 Fix #4755: Crash loading new map while running a server 2016-11-11 18:27:40 +01:00
Michał Janiszewski b164c2be61 Extract openrct2_assert to guard.h (#4753) 
* Extract openrct2_assert to Guard.hpp

`openrct2_assert` is not defined in util.c and including all of
openrct2.h is unnecessary.
 2016-11-06 21:02:25 +01:00
Michał Janiszewski 88ccfad303 Merge pull request #4615 from janisozaur/mediate-network-objects 
Mediate network objects
 2016-10-22 15:46:03 +02:00
zsilencer e2e4201112 Validate peep game command which caused crash from invalid sprite index 2016-10-22 01:53:33 -06:00
Michał Janiszewski 194c9aed01 Refactor scenario_write_packed_objects and friends 2016-10-21 11:22:17 +02:00
Michał Janiszewski 65c6cd5412 Implement review suggestions 2016-10-21 11:22:17 +02:00
Michał Janiszewski 5ebc95e0b2 Mediate objects to send over from server 2016-10-21 11:22:17 +02:00
Michał Janiszewski 3a0e3c04e1 network send map refactor 2016-10-21 11:22:17 +02:00
zsilencer 541ae91d67 fix pickup commands to work with hiring staff 2016-10-18 13:40:50 -06:00
zsilencer d74efb23fe Add picking up peeps/staff as game command 2016-10-18 13:40:49 -06:00
LRFLEW e5ff7412e4 Refactor/Improve String and Path Handling 2016-10-09 15:29:58 -05:00
Michał Janiszewski 9966052ca7 Fix more configurations 2016-10-06 23:32:10 +02:00
Ted John 8932707018 Don't show read groups.json error when it doesn't exist 2016-10-02 13:38:22 +01:00
Ted John 22c7cd4179 Improve bad error messages in multiplayer window 
Set the title and text in the multiplayer commands to make sure it doesn't show an error box with the wrong text.
 2016-10-02 12:28:28 +01:00
Michał Janiszewski 6a86f007f3 Fix #4437: Crash in Network::Server_Handle_AUTH 2016-09-19 19:25:00 +01:00
Marijn van der Werf 487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
zsilencer dfc100f15e Fix issue with kick message not being received 2016-09-14 15:48:15 -06:00
LRFLEW e1b6319bc1 Fix Warnings in Xcode about Copy Elision 2016-09-13 18:07:40 -05:00
Ted John b8e4f71ab1 Fix #4422: Save overwrite multiplayer 
Make sure we reset gFirstTimeSave when we join a new game or exit to title screen.
 2016-09-13 23:53:46 +01:00
Ted John ef7cd793a4 x64: Fix game_command_modify_groups 2016-09-10 18:35:12 +01:00
Ted John 91eb33255b Remove Exception::GetMsg() 
We can undef any macro windows.h defines and interferes with our code base. In this case GetMessage
 2016-09-08 21:37:27 +01:00
Michał Janiszewski 163e314379 Remove unused or set-but-not-read variables 2016-09-07 13:39:29 +01:00
Ted John 8bc69b549f Set advertiser to null after deletion 2016-09-04 11:17:15 +01:00
Ted John d73c2ba13c Wire up new advertiser class 2016-08-29 15:35:46 +01:00
Ted John 8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Tom Delebo 50348e015e Changed the server greeting buffer from 256 to 1024 
* Changed the server greeting buffer size to accept longer strings
* Added comment explaining character limit for greeting buffer
* Moved chat constants to header file to allow access from includes
 2016-08-20 23:20:53 +01:00
Thomas Delebo 51eac62636 #4279 Truncate greeting so we don't overflow buffer 2016-08-15 12:08:23 -05:00
delebota e806a88d71 #4193 Add a server greeting which is displayed to connecting user 2016-08-13 23:15:45 -05:00
Yaroslav Tretyakov c967114463 Fix #4215: Multiplayer, default group does not work correctly with group IDs 2016-08-08 09:01:52 +01:00
Michał Janiszewski e930a09f0b Free compressed map when failed to connect client 2016-08-03 07:39:55 +02:00
zsilencer 5d04e5e03e Multiplayer desync stuff 2016-08-01 20:47:21 +02:00
Michał Janiszewski 84137738e3 Disconnect client in case map sending fails 2016-07-30 10:13:08 +02:00
Michał Janiszewski 64c0c594dc Check if memory was allocated successfully for server map 
Somehow, there are cases where server thinks a map is around 2GiB in
size. Such allocation will most likely fail on 32-bit system and crash
the server. This provides *some* safety check and at least prevents
server from crashing in such cases.
 2016-07-30 10:13:08 +02:00
Michał Janiszewski 04fb336d1f Fix typo in comment 2016-07-27 15:09:30 +02:00
Michał Janiszewski 1fe5fc56c0 Checksum sprites occasionally in multiplayer 
This creates a checksum (SHA1) every so often on server and sends this
value together with PRNG seed for client to check it has still not
desynced.

It's useful to detect a desync early on, as PRNG seeds may remain
unchanged for some more time, while damage may have already been caused.
 2016-07-27 15:54:02 +02:00
Michał Janiszewski 82d52b63e6 Verify NetworkActions access 2016-07-26 15:07:33 +01:00
Ted John e5722e1d9a Fix #4139: Windows first time firewall launch 
std::string can not handle nullptr as argument. Create and use helper method instead.
 2016-07-19 21:53:18 +01:00
Michał Janiszewski 836450cab4 Fix declarations of network-less builds 2016-07-14 14:11:50 +02:00
Michał Janiszewski a6d0e6916e Fix function definitions to match their declarations 
This makes sure every function is properly declared, which includes
proper `extern` wrappers.
 2016-07-14 14:11:49 +02:00
Marijn van der Werf 5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02: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
Michał Janiszewski 9041551b97 Guard server against null signature 2016-06-23 20:09:56 +01:00