Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 20:58:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

style: don't break after return types

Browse source
This commit is contained in:
rr- 2021-10-31 18:51:49 +01:00 • committed by Marcin Kurczewski
parent 9660230e99
commit 945bbe1ba3
10 changed files with 48 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.clang-format
View file

@ -7,3 +7,5 @@ BreakBeforeBinaryOperators: NonAssignment
AlignAfterOpenBracket: AlwaysBreak AlignAfterOpenBracket: AlwaysBreak
SortIncludes: false SortIncludes: false
PointerAlignment: Right PointerAlignment: Right
AlwaysBreakAfterReturnType: None
PenaltyReturnTypeOnItsOwnLine: 1000

4
src/config.c
View file

@ -77,8 +77,8 @@ static int8_t ReadBarLocation(
return default_value; return default_value;
} }
static int8_t static int8_t ReadBarColor(
ReadBarColor(struct json_object_s *obj, const char *name, int8_t default_value) struct json_object_s *obj, const char *name, int8_t default_value)
{ {
const char *value_str = json_object_get_string(obj, name, NULL); const char *value_str = json_object_get_string(obj, name, NULL);
if (value_str) { if (value_str) {

4
src/filesystem.h
View file

@ -18,8 +18,8 @@ typedef struct MYFILE MYFILE;
MYFILE *FileOpen(const char *path, FILE_OPEN_MODE mode); MYFILE *FileOpen(const char *path, FILE_OPEN_MODE mode);
size_t FileRead(void *data, size_t item_size, size_t count, MYFILE *file); size_t FileRead(void *data, size_t item_size, size_t count, MYFILE *file);
size_t size_t FileWrite(
FileWrite(const void *data, size_t item_size, size_t count, MYFILE *file); const void *data, size_t item_size, size_t count, MYFILE *file);
size_t FileSize(MYFILE *file); size_t FileSize(MYFILE *file);
void FileSeek(MYFILE *file, size_t pos, FILE_SEEK_MODE mode); void FileSeek(MYFILE *file, size_t pos, FILE_SEEK_MODE mode);
void FileClose(MYFILE *file); void FileClose(MYFILE *file);

12
src/game/collide.h
View file

@ -27,13 +27,13 @@ void TrapCollision(int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll);
void ItemPushLara( void ItemPushLara(
ITEM_INFO *item, ITEM_INFO *lara_item, COLL_INFO *coll, int32_t spazon, ITEM_INFO *item, ITEM_INFO *lara_item, COLL_INFO *coll, int32_t spazon,
int32_t bigpush); int32_t bigpush);
int32_t int32_t TestBoundsCollide(
TestBoundsCollide(ITEM_INFO *item, ITEM_INFO *lara_item, int32_t radius); ITEM_INFO *item, ITEM_INFO *lara_item, int32_t radius);
int32_t int32_t TestLaraPosition(
TestLaraPosition(int16_t *bounds, ITEM_INFO *item, ITEM_INFO *lara_item); int16_t *bounds, ITEM_INFO *item, ITEM_INFO *lara_item);
void AlignLaraPosition(PHD_VECTOR *vec, ITEM_INFO *item, ITEM_INFO *lara_item); void AlignLaraPosition(PHD_VECTOR *vec, ITEM_INFO *item, ITEM_INFO *lara_item);
int32_t int32_t MoveLaraPosition(
MoveLaraPosition(PHD_VECTOR *vec, ITEM_INFO *item, ITEM_INFO *lara_item); PHD_VECTOR *vec, ITEM_INFO *item, ITEM_INFO *lara_item);
int32_t Move3DPosTo3DPos( int32_t Move3DPosTo3DPos(
PHD_3DPOS *srcpos, PHD_3DPOS *destpos, int32_t velocity, PHD_ANGLE angadd); PHD_3DPOS *srcpos, PHD_3DPOS *destpos, int32_t velocity, PHD_ANGLE angadd);
int32_t ItemNearLara(PHD_3DPOS *pos, int32_t distance); int32_t ItemNearLara(PHD_3DPOS *pos, int32_t distance);

4
src/game/mnsound.c
View file

@ -243,8 +243,8 @@ int32_t mn_sound_effect(int32_t sfx_num, PHD_3DPOS *pos, uint32_t flags)
return 0; return 0;
} }
MN_SFX_PLAY_INFO * MN_SFX_PLAY_INFO *mn_get_fx_slot(
mn_get_fx_slot(int32_t sfx_num, uint32_t loudness, PHD_3DPOS *pos, int16_t mode) int32_t sfx_num, uint32_t loudness, PHD_3DPOS *pos, int16_t mode)
{ {
switch (mode) { switch (mode) {
case SOUND_WAIT: case SOUND_WAIT:

28
src/json.c
View file

@ -2868,8 +2868,8 @@ void json_array_append_array(
json_array_append(arr, json_value_from_array(arr2)); json_array_append(arr, json_value_from_array(arr2));
} }
struct json_value_s * struct json_value_s *json_array_get_value(
json_array_get_value(struct json_array_s *arr, const size_t idx) struct json_array_s *arr, const size_t idx)
{ {
if (!arr || idx >= arr->length) { if (!arr || idx >= arr->length) {
return json_null; return json_null;
@ -2913,8 +2913,8 @@ double json_array_get_number_double(
return d; return d;
} }
const char * const char *json_array_get_string(
json_array_get_string(struct json_array_s *arr, const size_t idx, const char *d) struct json_array_s *arr, const size_t idx, const char *d)
{ {
struct json_value_s *value = json_array_get_value(arr, idx); struct json_value_s *value = json_array_get_value(arr, idx);
struct json_string_s *str = json_value_as_string(value); struct json_string_s *str = json_value_as_string(value);
@ -2924,16 +2924,16 @@ json_array_get_string(struct json_array_s *arr, const size_t idx, const char *d)
return d; return d;
} }
struct json_array_s * struct json_array_s *json_array_get_array(
json_array_get_array(struct json_array_s *arr, const size_t idx) struct json_array_s *arr, const size_t idx)
{ {
struct json_value_s *value = json_array_get_value(arr, idx); struct json_value_s *value = json_array_get_value(arr, idx);
struct json_array_s *arr2 = json_value_as_array(value); struct json_array_s *arr2 = json_value_as_array(value);
return arr2; return arr2;
} }
struct json_object_s * struct json_object_s *json_array_get_object(
json_array_get_object(struct json_array_s *arr, const size_t idx) struct json_array_s *arr, const size_t idx)
{ {
struct json_value_s *value = json_array_get_value(arr, idx); struct json_value_s *value = json_array_get_value(arr, idx);
struct json_object_s *obj = json_value_as_object(value); struct json_object_s *obj = json_value_as_object(value);
@ -3008,8 +3008,8 @@ void json_object_append_array(
json_object_append(obj, key, json_value_from_array(arr)); json_object_append(obj, key, json_value_from_array(arr));
} }
struct json_value_s * struct json_value_s *json_object_get_value(
json_object_get_value(struct json_object_s *obj, const char *key) struct json_object_s *obj, const char *key)
{ {
if (!obj) { if (!obj) {
return json_null; return json_null;
@ -3068,16 +3068,16 @@ const char *json_object_get_string(
return d; return d;
} }
struct json_array_s * struct json_array_s *json_object_get_array(
json_object_get_array(struct json_object_s *obj, const char *key) struct json_object_s *obj, const char *key)
{ {
struct json_value_s *value = json_object_get_value(obj, key); struct json_value_s *value = json_object_get_value(obj, key);
struct json_array_s *arr = json_value_as_array(value); struct json_array_s *arr = json_value_as_array(value);
return arr; return arr;
} }
struct json_object_s * struct json_object_s *json_object_get_object(
json_object_get_object(struct json_object_s *obj, const char *key) struct json_object_s *obj, const char *key)
{ {
struct json_value_s *value = json_object_get_value(obj, key); struct json_value_s *value = json_object_get_value(obj, key);
struct json_object_s *obj2 = json_value_as_object(value); struct json_object_s *obj2 = json_value_as_object(value);

28
src/json.h
View file

@ -271,8 +271,8 @@ char *json_write_minified_value(const struct json_value_s *value, char *data);
char *json_write_number(const struct json_number_s *number, char *data); char *json_write_number(const struct json_number_s *number, char *data);
char *json_write_string(const struct json_string_s *string, char *data); char *json_write_string(const struct json_string_s *string, char *data);
char *json_write_minified_array(const struct json_array_s *array, char *data); char *json_write_minified_array(const struct json_array_s *array, char *data);
char * char *json_write_minified_object(
json_write_minified_object(const struct json_object_s *object, char *data); const struct json_object_s *object, char *data);
int json_write_pretty_get_value_size( int json_write_pretty_get_value_size(
const struct json_value_s *value, size_t depth, size_t indent_size, const struct json_value_s *value, size_t depth, size_t indent_size,
size_t newline_size, size_t *size); size_t newline_size, size_t *size);
@ -313,8 +313,8 @@ void json_array_append_number_double(struct json_array_s *arr, double number);
void json_array_append_array( void json_array_append_array(
struct json_array_s *arr, struct json_array_s *arr2); struct json_array_s *arr, struct json_array_s *arr2);
struct json_value_s * struct json_value_s *json_array_get_value(
json_array_get_value(struct json_array_s *arr, const size_t idx); struct json_array_s *arr, const size_t idx);
int json_array_get_bool(struct json_array_s *arr, const size_t idx, int d); int json_array_get_bool(struct json_array_s *arr, const size_t idx, int d);
int json_array_get_number_int( int json_array_get_number_int(
struct json_array_s *arr, const size_t idx, int d); struct json_array_s *arr, const size_t idx, int d);
@ -322,10 +322,10 @@ double json_array_get_number_double(
struct json_array_s *arr, const size_t idx, double d); struct json_array_s *arr, const size_t idx, double d);
const char *json_array_get_string( const char *json_array_get_string(
struct json_array_s *arr, const size_t idx, const char *d); struct json_array_s *arr, const size_t idx, const char *d);
struct json_array_s * struct json_array_s *json_array_get_array(
json_array_get_array(struct json_array_s *arr, const size_t idx); struct json_array_s *arr, const size_t idx);
struct json_object_s * struct json_object_s *json_array_get_object(
json_array_get_object(struct json_array_s *arr, const size_t idx); struct json_array_s *arr, const size_t idx);
// objects // objects
struct json_object_s *json_object_new(); struct json_object_s *json_object_new();
@ -341,8 +341,8 @@ void json_object_append_number_double(
void json_object_append_array( void json_object_append_array(
struct json_object_s *obj, const char *key, struct json_array_s *arr); struct json_object_s *obj, const char *key, struct json_array_s *arr);
struct json_value_s * struct json_value_s *json_object_get_value(
json_object_get_value(struct json_object_s *obj, const char *key); struct json_object_s *obj, const char *key);
int json_object_get_bool(struct json_object_s *obj, const char *key, int d); int json_object_get_bool(struct json_object_s *obj, const char *key, int d);
int json_object_get_number_int( int json_object_get_number_int(
struct json_object_s *obj, const char *key, int d); struct json_object_s *obj, const char *key, int d);
@ -350,10 +350,10 @@ double json_object_get_number_double(
struct json_object_s *obj, const char *key, double d); struct json_object_s *obj, const char *key, double d);
const char *json_object_get_string( const char *json_object_get_string(
struct json_object_s *obj, const char *key, const char *d); struct json_object_s *obj, const char *key, const char *d);
struct json_array_s * struct json_array_s *json_object_get_array(
json_object_get_array(struct json_object_s *obj, const char *key); struct json_object_s *obj, const char *key);
struct json_object_s * struct json_object_s *json_object_get_object(
json_object_get_object(struct json_object_s *obj, const char *key); struct json_object_s *obj, const char *key);
// values // values
struct json_string_s *json_value_as_string(struct json_value_s *const value); struct json_string_s *json_value_as_string(struct json_value_s *const value);

4
src/specific/hwr.c
View file

@ -1583,8 +1583,8 @@ void HWR_DrawTexturedQuad(
// the requested texture page was not loaded. // the requested texture page was not loaded.
} }
int32_t int32_t HWR_ZedClipper(
HWR_ZedClipper(int32_t vertex_count, POINT_INFO *pts, C3D_VTCF *vertices) int32_t vertex_count, POINT_INFO *pts, C3D_VTCF *vertices)
{ {
int32_t i; int32_t i;
int32_t count; int32_t count;

4
src/specific/hwr.h
View file

@ -58,8 +58,8 @@ void HWR_DownloadTextures(int32_t pages);
void HWR_InitPolyList(); void HWR_InitPolyList();
void HWR_OutputPolyList(); void HWR_OutputPolyList();
int32_t int32_t HWR_ZedClipper(
HWR_ZedClipper(int32_t vertex_count, POINT_INFO *pts, C3D_VTCF *vertices); int32_t vertex_count, POINT_INFO *pts, C3D_VTCF *vertices);
void HWR_DrawFlatTriangle( void HWR_DrawFlatTriangle(
PHD_VBUF *vn1, PHD_VBUF *vn2, PHD_VBUF *vn3, int32_t color); PHD_VBUF *vn1, PHD_VBUF *vn2, PHD_VBUF *vn3, int32_t color);

4
test/test_gameflow.c
View file

@ -21,8 +21,8 @@ static char *read_file_text(const char *path)
return data; return data;
} }
static void static void assert_json_keys_equal(
assert_json_keys_equal(struct json_object_s *obj1, struct json_object_s *obj2) struct json_object_s *obj1, struct json_object_s *obj2)
{ {
ASSERT_ULONG_EQUAL(obj1->length, obj2->length); ASSERT_ULONG_EQUAL(obj1->length, obj2->length);
struct json_object_element_s *obj1_elem = obj1->start; struct json_object_element_s *obj1_elem = obj1->start;