mirror of
https://github.com/Cesarus85/ringfall-mjolnir-vr.git
synced 2026-10-23 06:00:25 +02:00
Close three more units owners exactly: units.obj reaches 182/7/0
Census 179/10/0 -> 182/7/0 code, data unchanged at 129/0/0.
code_001a0cf0 (1568/43). Five switch arms each ended in the call plus return;
making them all break with one shared code_0019ea70 call after the switch lets
VC7 tail-duplicate the call and epilogue back into every arm, which reproduces
January's five ret sites. The right-direction arm additionally needs the
negation hoisted into a real temp so fchs issues one slot earlier. The handoff's
"return-block specialisation signal" for this owner was a false lead: the
21-vs-19 al-write gap was one two-colour register swap in the tail, with
alignment_vector in ecx and the scratch chain in eax, and all fifteen blocks
were downstream of it.
unit_set_or_test_seat_and_weapon_label (544/12). Four coupled edits: all three
loop counters are short in January, not just seat_index (the third homed slot is
the whole frame difference); showing_acceleration must be left uninitialised and
reached by falling past a goto, otherwise its initialiser sinks between a cmp
and its jne and forces the anim_2 ternary to be materialised instead of
branch-folded; weapon_label is tested for NULL, not for an empty string, which
was also a live null dereference since callers pass NULL; and the animation
field assignment order is seat, base_seat, weapon_index, weapon_type_index.
unit_cause_player_melee_damage (1600/57). The intermediate temp is double with
an explicit (real) cast at each use. The declared type of a floating-point
intermediate shifts VC7's x87/integer interleave without changing any emitted
instruction: a double temp makes the dependent op issue a slot earlier, which is
what drains the extra integer op into the fmul shadow. The casts are
load-bearing; without them the float constants promote and fmul dword becomes
fmul qword.
Wave gates: /Zs exit 0 with no warnings; contained deletion with a dry run
proving exactly one CL edge; one emission; owner gate pinned to 97fc1230 shows
exactly three changed owners of 220, all intended; determinism replay identical
across all 220 owners.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Jonas VolmanandClaude Fable 5 committed
1 parent
c405ccb448
commit
6f18872a72
1 file changed
+24
-19
+24
-19
@@ -6750,26 +6750,27 @@ apply_alignment:
|
||||
{
|
||||
case _unit_damage_direction_back:
|
||||
transformed_alignment = *alignment_vector;
|
||||
code_0019ea70(unit_index, &transformed_alignment);
|
||||
return;
|
||||
break;
|
||||
|
||||
case _unit_damage_direction_front:
|
||||
transformed_alignment.i = -alignment_vector->i;
|
||||
transformed_alignment.j = -alignment_vector->j;
|
||||
code_0019ea70(unit_index, &transformed_alignment);
|
||||
return;
|
||||
break;
|
||||
|
||||
case _unit_damage_direction_left:
|
||||
transformed_alignment.i = -alignment_vector->j;
|
||||
transformed_alignment.j = alignment_vector->i;
|
||||
code_0019ea70(unit_index, &transformed_alignment);
|
||||
return;
|
||||
break;
|
||||
|
||||
case _unit_damage_direction_right:
|
||||
{
|
||||
real negated_i;
|
||||
|
||||
negated_i = -alignment_vector->i;
|
||||
transformed_alignment.i = alignment_vector->j;
|
||||
transformed_alignment.j = -alignment_vector->i;
|
||||
code_0019ea70(unit_index, &transformed_alignment);
|
||||
return;
|
||||
transformed_alignment.j = negated_i;
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
display_assert(
|
||||
@@ -6778,9 +6779,10 @@ apply_alignment:
|
||||
4562,
|
||||
TRUE);
|
||||
system_exit(-1);
|
||||
code_0019ea70(unit_index, &transformed_alignment);
|
||||
return;
|
||||
break;
|
||||
}
|
||||
|
||||
code_0019ea70(unit_index, &transformed_alignment);
|
||||
}
|
||||
|
||||
return;
|
||||
@@ -7958,11 +7960,11 @@ static boolean unit_set_or_test_seat_and_weapon_label(
|
||||
|
||||
if (!seat_label || !_stricmp(seat_label, unit_seat->label))
|
||||
{
|
||||
long weapon_class_index;
|
||||
short weapon_class_index;
|
||||
|
||||
for (weapon_class_index = 0; weapon_class_index<unit_seat->weapon_classes.count; ++weapon_class_index)
|
||||
{
|
||||
long weapon_type_index;
|
||||
short weapon_type_index;
|
||||
|
||||
struct animation_graph_weapon_class *weapon_class = TAG_BLOCK_GET_ELEMENT(&unit_seat->weapon_classes, weapon_class_index, struct animation_graph_weapon_class);
|
||||
|
||||
@@ -7970,7 +7972,7 @@ static boolean unit_set_or_test_seat_and_weapon_label(
|
||||
{
|
||||
struct animation_graph_weapon_type *weapon_type = TAG_BLOCK_GET_ELEMENT(&weapon_class->weapon_types, weapon_type_index, struct animation_graph_weapon_type);
|
||||
|
||||
if (*weapon_label=='\0' ||
|
||||
if (!weapon_label ||
|
||||
!strcmp(weapon_label, "unarmed") &&
|
||||
weapon_type->label[0]=='\0'||
|
||||
!_stricmp(weapon_label, weapon_type->label))
|
||||
@@ -7981,7 +7983,7 @@ static boolean unit_set_or_test_seat_and_weapon_label(
|
||||
unit_seat->animations.count <= 2 ?
|
||||
NONE :
|
||||
animation_graph_animation_index_get(&unit_seat->animations)[2].animation_index;
|
||||
boolean showing_acceleration = TRUE;
|
||||
boolean showing_acceleration;
|
||||
|
||||
if (anim_2==NONE)
|
||||
{
|
||||
@@ -8000,9 +8002,12 @@ static boolean unit_set_or_test_seat_and_weapon_label(
|
||||
if (anim_4==NONE)
|
||||
{
|
||||
showing_acceleration = FALSE;
|
||||
goto acceleration_determined;
|
||||
}
|
||||
}
|
||||
}
|
||||
showing_acceleration = TRUE;
|
||||
acceleration_determined:
|
||||
|
||||
if (unit->unit.animation.state!=_unit_state_user_animation)
|
||||
{
|
||||
@@ -8010,9 +8015,9 @@ static boolean unit_set_or_test_seat_and_weapon_label(
|
||||
}
|
||||
|
||||
unit->unit.animation.seat_index = seat_index;
|
||||
unit->unit.animation.weapon_type_index = weapon_type_index;
|
||||
unit->unit.animation.base_seat_index = seat_label_to_base_seat_index(seat_label);
|
||||
unit->unit.animation.weapon_index = weapon_class_index;
|
||||
unit->unit.animation.weapon_type_index = weapon_type_index;
|
||||
|
||||
SET_FLAG(unit->unit.animation.flags, _unit_animation_showing_acceleration_bit, showing_acceleration);
|
||||
}
|
||||
@@ -8786,13 +8791,13 @@ void unit_cause_player_melee_damage(
|
||||
|
||||
do
|
||||
{
|
||||
real inner_component_i = cross.i * (real)inner_index;
|
||||
double inner_component_i = cross.i * (real)inner_index;
|
||||
|
||||
ray.i = facing->i * 0.8f +
|
||||
(inner_component_i + (real)outer_index * perpendicular.i) * 0.1f;
|
||||
((real)inner_component_i + (real)outer_index * perpendicular.i) * 0.1f;
|
||||
inner_component_i = cross.j * (real)inner_index;
|
||||
ray.j = unit->unit.aiming_vector.j * 0.8f +
|
||||
(inner_component_i + (real)outer_index * perpendicular.j) * 0.1f;
|
||||
((real)inner_component_i + (real)outer_index * perpendicular.j) * 0.1f;
|
||||
ray.k = unit->unit.aiming_vector.k * 0.8f +
|
||||
((real)outer_index * perpendicular.k + (real)inner_index * cross.k) * 0.1f;
|
||||
|
||||
|
||||
Reference in new issue
Block a user