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

move pointer alignment to right

Browse source
This commit is contained in:
rr- 2021-03-07 23:34:28 +01:00
parent 76707fdfb2
commit 64e1d247b8
80 changed files with 1612 additions and 1599 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.clang-format
View file

@ -6,3 +6,4 @@ AllowShortFunctionsOnASingleLine: InlineOnly
BreakBeforeBinaryOperators: NonAssignment
AlignAfterOpenBracket: AlwaysBreak
SortIncludes: false
PointerAlignment: Right

24
src/game/draw.c
View file

@ -674,7 +674,8 @@ void DrawLara(ITEM_INFO* item)
PhdMatrixPtr->_22 = PhdMatrixPtr[-2]._22;
packed_rotation =
(int32_t*)(Lara.right_arm.frame_base + Lara.right_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
(int32_t
*)(Lara.right_arm.frame_base + Lara.right_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
phd_RotYXZ(
Lara.right_arm.y_rot, Lara.right_arm.x_rot, Lara.right_arm.z_rot);
phd_RotYXZpack(packed_rotation[LM_UARM_R]);
@ -709,7 +710,8 @@ void DrawLara(ITEM_INFO* item)
PhdMatrixPtr->_22 = PhdMatrixPtr[-2]._22;
packed_rotation =
(int32_t*)(Lara.left_arm.frame_base + Lara.left_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
(int32_t
*)(Lara.left_arm.frame_base + Lara.left_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
phd_RotYXZ(
Lara.left_arm.y_rot, Lara.left_arm.x_rot, Lara.left_arm.z_rot);
phd_RotYXZpack(packed_rotation[LM_UARM_L]);
@ -738,7 +740,8 @@ void DrawLara(ITEM_INFO* item)
phd_PushMatrix();
packed_rotation =
(int32_t*)(Lara.right_arm.frame_base + Lara.right_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
(int32_t
*)(Lara.right_arm.frame_base + Lara.right_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
phd_TranslateRel(bone[29], bone[30], bone[31]);
phd_RotYXZpack(packed_rotation[LM_UARM_R]);
phd_PutPolygons(Lara.mesh_ptrs[LM_UARM_R], clip);
@ -762,7 +765,8 @@ void DrawLara(ITEM_INFO* item)
phd_PushMatrix();
packed_rotation =
(int32_t*)(Lara.left_arm.frame_base + Lara.left_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
(int32_t
*)(Lara.left_arm.frame_base + Lara.left_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
phd_TranslateRel(bone[41], bone[42], bone[43]);
phd_RotYXZpack(packed_rotation[LM_UARM_L]);
phd_PutPolygons(Lara.mesh_ptrs[LM_UARM_L], clip);
@ -1011,7 +1015,8 @@ void DrawLaraInt(
InterpolateArmMatrix();
packed_rotation1 =
(int32_t*)(Lara.right_arm.frame_base + Lara.right_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
(int32_t
*)(Lara.right_arm.frame_base + Lara.right_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
phd_RotYXZ(
Lara.right_arm.y_rot, Lara.right_arm.x_rot, Lara.right_arm.z_rot);
phd_RotYXZpack(packed_rotation1[LM_UARM_R]);
@ -1037,7 +1042,8 @@ void DrawLaraInt(
InterpolateArmMatrix();
packed_rotation1 =
(int32_t*)(Lara.left_arm.frame_base + Lara.left_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
(int32_t
*)(Lara.left_arm.frame_base + Lara.left_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
phd_RotYXZ(
Lara.left_arm.y_rot, Lara.left_arm.x_rot, Lara.left_arm.z_rot);
phd_RotYXZpack(packed_rotation1[LM_UARM_L]);
@ -1068,7 +1074,8 @@ void DrawLaraInt(
InterpolateMatrix();
packed_rotation1 =
(int32_t*)(Lara.right_arm.frame_base + Lara.right_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
(int32_t
*)(Lara.right_arm.frame_base + Lara.right_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
phd_TranslateRel(bone[29], bone[30], bone[31]);
phd_RotYXZpack(packed_rotation1[LM_UARM_R]);
phd_PutPolygons(Lara.mesh_ptrs[LM_UARM_R], clip);
@ -1092,7 +1099,8 @@ void DrawLaraInt(
phd_PushMatrix();
packed_rotation1 =
(int32_t*)(Lara.left_arm.frame_base + Lara.left_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
(int32_t
*)(Lara.left_arm.frame_base + Lara.left_arm.frame_number * (object->nmeshes * 2 + FRAME_ROT) + 10);
phd_TranslateRel(bone[41], bone[42], bone[43]);
phd_RotYXZpack(packed_rotation1[LM_UARM_L]);
phd_PutPolygons(Lara.mesh_ptrs[LM_UARM_L], clip);

3
src/game/invfunc.c
View file

@ -156,7 +156,8 @@ void RingNotActive(INVENTORY_ITEM* inv_item)
default:
// XXX: terrible hack
InvItemText[IT_NAME] = T_Print(0, -16, 0, (char*)inv_item->item_id);
InvItemText[IT_NAME] =
T_Print(0, -16, 0, (char *)inv_item->item_id);
break;
}

9
src/json-parser/json.c
View file

@ -1559,7 +1559,8 @@ void json_parse_value(
value->type = json_type_number;
value->payload = state->dom;
state->dom += sizeof(struct json_number_s);
json_parse_number(state, (struct json_number_s*)value->payload);
json_parse_number(
state, (struct json_number_s *)value->payload);
} else if (
(json_parse_flags_allow_inf_and_nan & flags_bitset)
&& (offset + 8) <= size && 'I' == src[offset + 0]
@ -1570,7 +1571,8 @@ void json_parse_value(
value->type = json_type_number;
value->payload = state->dom;
state->dom += sizeof(struct json_number_s);
json_parse_number(state, (struct json_number_s*)value->payload);
json_parse_number(
state, (struct json_number_s *)value->payload);
}
break;
}
@ -2847,7 +2849,8 @@ char* json_write_pretty_value(
return json_write_string((struct json_string_s *)value->payload, data);
case json_type_array:
return json_write_pretty_array(
(struct json_array_s*)value->payload, depth, indent, newline, data);
(struct json_array_s *)value->payload, depth, indent, newline,
data);
case json_type_object:
return json_write_pretty_object(
(struct json_object_s *)value->payload, depth, indent, newline,

4
src/json-parser/json.h
View file

@ -554,8 +554,8 @@ 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_object(
const struct json_object_s* object, char* data);
char *
json_write_minified_object(const struct json_object_s *object, char *data);
char *json_write_minified_value(const struct json_value_s *value, char *data);