mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct formatting for files in the project root

This commit is contained in:
Hielke Morsink 2018-07-20 23:39:55 +02:00
parent 7c6002cb26
commit 73a7e935c3
4 changed files with 75 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
View File

@ -208,7 +208,12 @@ public:
colour.a = i == 0 ? 0 : 255;
Palette[i] = colour;
GLPalette[i] = { colour.r / 255.0f, colour.g / 255.0f, colour.b / 255.0f, colour.a / 255.0f };
GLPalette[i] = {
colour.r / 255.0f,
colour.g / 255.0f,
colour.b / 255.0f,
colour.a / 255.0f,
};
}
_applyPaletteShader->Use();

21
src/openrct2/Context.cpp
View File

@ -112,8 +112,8 @@ namespace OpenRCT2
uint32_t _lastUpdateTick = 0;
bool _variableFrame = false;
/** If set, will end the OpenRCT2 game loop. Intentially private to this module so that the flag can not be set back to
* false. */
// If set, will end the OpenRCT2 game loop. Intentially private to this module so that the flag can not be set back to
// false.
bool _finished = false;
public:
@ -232,14 +232,15 @@ namespace OpenRCT2
std::string GetPathLegacy(int32_t pathId) override
{
static constexpr const char* const LegacyFileNames[PATH_ID_END]
= { nullptr, nullptr, "css1.dat", "css2.dat", "css4.dat", "css5.dat", "css6.dat", "css7.dat",
"css8.dat", "css9.dat", "css11.dat", "css12.dat", "css13.dat", "css14.dat", "css15.dat", "css3.dat",
"css17.dat", "css18.dat", "css19.dat", "css20.dat", "css21.dat", "css22.dat", nullptr, "css23.dat",
"css24.dat", "css25.dat", "css26.dat", "css27.dat", "css28.dat", "css29.dat", "css30.dat", "css31.dat",
"css32.dat", "css33.dat", "css34.dat", "css35.dat", "css36.dat", "css37.dat", "css38.dat", "CUSTOM1.WAV",
"CUSTOM2.WAV", "css39.dat", "css40.dat", "css41.dat", nullptr, "css42.dat", "css43.dat", "css44.dat",
"css45.dat", "css46.dat", "css50.dat" };
static constexpr const char* const LegacyFileNames[PATH_ID_END] = {
nullptr, nullptr, "css1.dat", "css2.dat", "css4.dat", "css5.dat", "css6.dat", "css7.dat",
"css8.dat", "css9.dat", "css11.dat", "css12.dat", "css13.dat", "css14.dat", "css15.dat", "css3.dat",
"css17.dat", "css18.dat", "css19.dat", "css20.dat", "css21.dat", "css22.dat", nullptr, "css23.dat",
"css24.dat", "css25.dat", "css26.dat", "css27.dat", "css28.dat", "css29.dat", "css30.dat", "css31.dat",
"css32.dat", "css33.dat", "css34.dat", "css35.dat", "css36.dat", "css37.dat", "css38.dat", "CUSTOM1.WAV",
"CUSTOM2.WAV", "css39.dat", "css40.dat", "css41.dat", nullptr, "css42.dat", "css43.dat", "css44.dat",
"css45.dat", "css46.dat", "css50.dat",
};
std::string result;
if (pathId == PATH_ID_CSS50)

4
src/openrct2/Diagnostic.cpp
View File

@ -68,7 +68,9 @@ void diagnostic_log_with_location(
#else
static constexpr const char* _level_strings[] = { "FATAL", "ERROR", "WARNING", "VERBOSE", "INFO" };
static constexpr const char* _level_strings[] = {
"FATAL", "ERROR", "WARNING", "VERBOSE", "INFO",
};
void diagnostic_log(DIAGNOSTIC_LEVEL diagnosticLevel, const char* format, ...)
{

77
src/openrct2/Game.cpp
View File

@ -547,7 +547,10 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
{
// Get cheat name
const char* cheat = cheats_get_cheat_string(*ecx, *edx, *edi);
char* args[2] = { (char*)player_name, (char*)cheat };
char* args[2] = {
(char*)player_name,
(char*)cheat,
};
format_string(log_msg, 256, STR_LOG_CHEAT_USED, args);
network_append_server_log(log_msg);
}
@ -559,8 +562,10 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
char ride_name[128];
format_string(ride_name, 128, ride->name, &ride->name_arguments);
char* args[2] = { (char*)player_name, ride_name };
char* args[2] = {
(char*)player_name,
ride_name,
};
format_string(log_msg, 256, STR_LOG_CREATE_RIDE, args);
network_append_server_log(log_msg);
}
@ -571,8 +576,10 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
char ride_name[128];
format_string(ride_name, 128, ride->name, &ride->name_arguments);
char* args[2] = { (char*)player_name, ride_name };
char* args[2] = {
(char*)player_name,
ride_name,
};
format_string(log_msg, 256, STR_LOG_DEMOLISH_RIDE, args);
network_append_server_log(log_msg);
}
@ -586,7 +593,10 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
char ride_name[128];
format_string(ride_name, 128, ride->name, &ride->name_arguments);
char* args[2] = { (char*)player_name, ride_name };
char* args[2] = {
(char*)player_name,
ride_name,
};
switch (command)
{
@ -611,7 +621,10 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
char ride_name[128];
format_string(ride_name, 128, ride->name, &ride->name_arguments);
char* args[2] = { (char*)player_name, ride_name };
char* args[2] = {
(char*)player_name,
ride_name,
};
int status = *edx >> 8;
switch (status)
@ -643,7 +656,11 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
format_string(price_str, 16, STR_BOTTOM_TOOLBAR_CASH, price_args);
// Log change in primary or secondary price
char* args[3] = { (char*)player_name, ride_name, price_str };
char* args[3] = {
(char*)player_name,
ride_name,
price_str,
};
if (*edx >> 8 == 0)
{
@ -659,7 +676,9 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
else if (command == GAME_COMMAND_SET_PARK_OPEN)
{
// Log change in park open/close
char* args[1] = { (char*)player_name };
char* args[1] = {
(char*)player_name,
};
if (*edx >> 8 == 0)
{
@ -680,7 +699,10 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
format_string(price_str, 16, STR_BOTTOM_TOOLBAR_CASH, price_args);
// Log change in park entrance fee
char* args[2] = { (char*)player_name, price_str };
char* args[2] = {
(char*)player_name,
price_str,
};
format_string(log_msg, 256, STR_LOG_PARK_ENTRANCE_FEE, args);
network_append_server_log(log_msg);
@ -697,7 +719,9 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
}
// Log placing scenery
char* args[1] = { (char*)player_name };
char* args[1] = {
(char*)player_name,
};
format_string(log_msg, 256, STR_LOG_PLACE_SCENERY, args);
network_append_server_log(log_msg);
@ -714,8 +738,9 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
}
// Log removing scenery
char* args[1] = { (char*)player_name };
char* args[1] = {
(char*)player_name,
};
format_string(log_msg, 256, STR_LOG_REMOVE_SCENERY, args);
network_append_server_log(log_msg);
}
@ -726,8 +751,9 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
|| command == GAME_COMMAND_SET_BANNER_STYLE || command == GAME_COMMAND_SET_SIGN_STYLE)
{
// Log editing scenery
char* args[1] = { (char*)player_name };
char* args[1] = {
(char*)player_name,
};
format_string(log_msg, 256, STR_LOG_EDIT_SCENERY, args);
network_append_server_log(log_msg);
if (command == GAME_COMMAND_SET_BANNER_NAME || command == GAME_COMMAND_SET_SIGN_NAME)
@ -746,8 +772,11 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
memcpy(banner_name + nameChunkOffset + 4, ebp, 4);
memcpy(banner_name + nameChunkOffset + 8, edi, 4);
banner_name[sizeof(banner_name) - 1] = '\0';
char* args_sign[2] = { (char*)player_name, (char*)banner_name };
char* args_sign[2] = {
(char*)player_name,
(char*)banner_name,
};
format_string(log_msg, 256, STR_LOG_SET_SIGN_NAME, args_sign);
network_append_server_log(log_msg);
}
@ -760,22 +789,26 @@ void game_log_multiplayer_command(int command, const int* eax, const int* ebx, c
char ride_name[128];
format_string(ride_name, 128, ride->name, &ride->name_arguments);
char* args[2] = { (char*)player_name, ride_name };
char* args[2] = {
(char*)player_name,
ride_name,
};
format_string(log_msg, 256, STR_LOG_PLACE_TRACK, args);
network_append_server_log(log_msg);
}
else if (command == GAME_COMMAND_REMOVE_TRACK)
{
char* args[1] = { (char*)player_name };
char* args[1] = {
(char*)player_name,
};
format_string(log_msg, 256, STR_LOG_REMOVE_TRACK, args);
network_append_server_log(log_msg);
}
else if (command == GAME_COMMAND_PLACE_PEEP_SPAWN)
{
char* args[1] = { (char*)player_name };
char* args[1] = {
(char*)player_name,
};
format_string(log_msg, 256, STR_LOG_PLACE_PEEP_SPAWN, args);
network_append_server_log(log_msg);
}