Skip to content

Commit a3c2ddd

Browse files
LoobinexLoobinex
authored
Cleaned up and named CreatureControl vars (#3814)
no functional changes
1 parent 17ff6af commit a3c2ddd

File tree

5 files changed

+28
-42
lines changed

5 files changed

+28
-42
lines changed

‎src/creature_control.h

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ unsigned char sound_flag;
238238
union {
239239
struct {
240240
GameTurn start_gameturn;
241-
GameTurn gameturn_9Ex;
242-
GameTurn gameturn_A2x;
241+
GameTurn state_start_turn;
242+
GameTurn torturer_start_turn;
243243
ThingIndex assigned_torturer;
244244
unsigned char vis_state;
245245
} tortured;
@@ -276,7 +276,7 @@ unsigned char sound_flag;
276276
GameTurn last_mood_sound_turn;
277277
} imprison;
278278
struct {
279-
unsigned char byte_9A;
279+
unsigned char job_stage;
280280
unsigned char swing_weapon_counter;
281281
MapSubtlCoord stl_x;
282282
MapSubtlCoord stl_y;
@@ -307,15 +307,6 @@ unsigned char sound_flag;
307307
short word_9A;
308308
short word_9C;
309309
}sacrifice;
310-
struct {
311-
unsigned char byte_9A;
312-
}mad_psycho;
313-
314-
struct {
315-
unsigned char byte_9A;
316-
}unknown_state;
317-
318-
319310

320311
};
321312
unsigned char fight_til_death;

‎src/creature_jobs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ TbBool attempt_anger_job_mad_psycho(struct Thing *creatng)
327327
struct CreatureControl *cctrl = creature_control_get_from_thing(creatng);
328328
// Mad Psycho's anger job bypasses immunity.
329329
set_flag(cctrl->spell_flags, CSAfF_MadKilling);
330-
cctrl->mad_psycho.byte_9A = 0;
331330
return true;
332331
}
333332

‎src/creature_states_tortr.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ short at_kinky_torture_room(struct Thing *thing)
6868
cctrl->tortured.assigned_torturer = 0;
6969
cctrl->turns_at_job = game.play_gameturn;
7070
cctrl->tortured.start_gameturn = game.play_gameturn;
71-
cctrl->tortured.gameturn_9Ex = game.play_gameturn;
71+
cctrl->tortured.state_start_turn = game.play_gameturn;
7272
cctrl->tortured.vis_state = CTVS_TortureGoToDevice;
73-
cctrl->tortured.gameturn_A2x = game.play_gameturn;
73+
cctrl->tortured.torturer_start_turn = game.play_gameturn;
7474
internal_set_thing_state(thing, get_continue_state_for_job(Job_KINKY_TORTURE));
7575
return 1;
7676
}
@@ -102,9 +102,9 @@ short at_torture_room(struct Thing *thing)
102102
cctrl->tortured.assigned_torturer = 0;
103103
cctrl->turns_at_job = game.play_gameturn;
104104
cctrl->tortured.start_gameturn = game.play_gameturn;
105-
cctrl->tortured.gameturn_9Ex = game.play_gameturn;
105+
cctrl->tortured.state_start_turn = game.play_gameturn;
106106
cctrl->tortured.vis_state = CTVS_TortureGoToDevice;
107-
cctrl->tortured.gameturn_A2x = game.play_gameturn;
107+
cctrl->tortured.torturer_start_turn = game.play_gameturn;
108108
internal_set_thing_state(thing, get_continue_state_for_job(Job_PAINFUL_TORTURE));
109109
return 1;
110110
}
@@ -185,7 +185,7 @@ long process_torture_visuals(struct Thing *creatng, struct Room *room, CreatureJ
185185
switch (cctrl->tortured.vis_state)
186186
{
187187
case CTVS_TortureRandMove:
188-
if (game.play_gameturn - cctrl->tortured.gameturn_9Ex > 100) {
188+
if (game.play_gameturn - cctrl->tortured.state_start_turn > 100) {
189189
cctrl->tortured.vis_state = CTVS_TortureGoToDevice;
190190
}
191191
if (!creature_setup_adjacent_move_for_job_within_room(creatng, room, jobpref)) {
@@ -196,11 +196,11 @@ long process_torture_visuals(struct Thing *creatng, struct Room *room, CreatureJ
196196
case CTVS_TortureGoToDevice:
197197
if (!setup_torture_move_to_device(creatng, room, jobpref)) {
198198
cctrl->tortured.vis_state = CTVS_TortureRandMove;
199-
cctrl->tortured.gameturn_9Ex = game.play_gameturn;
199+
cctrl->tortured.state_start_turn = game.play_gameturn;
200200
return CrStRet_Unchanged;
201201
}
202202
cctrl->tortured.vis_state = CTVS_TortureInDevice;
203-
cctrl->tortured.gameturn_9Ex = game.play_gameturn;
203+
cctrl->tortured.state_start_turn = game.play_gameturn;
204204
return 1;
205205
case CTVS_TortureInDevice:
206206
sectng = thing_get(cctrl->tortured.assigned_torturer);
@@ -218,16 +218,16 @@ long process_torture_visuals(struct Thing *creatng, struct Room *room, CreatureJ
218218
} else {
219219
ERRORLOG("No device for torture");
220220
}
221-
dturn = game.play_gameturn - cctrl->tortured.gameturn_A2x;
221+
dturn = game.play_gameturn - cctrl->tortured.torturer_start_turn;
222222
if ((dturn > 32) || (creature_under_spell_effect(creatng, CSAfF_Speed) && (dturn > 16)))
223223
{
224224
play_creature_sound(creatng, CrSnd_Torture, 2, 0);
225-
cctrl->tortured.gameturn_A2x = game.play_gameturn;
225+
cctrl->tortured.torturer_start_turn = game.play_gameturn;
226226
}
227227
return CrStRet_Unchanged;
228228
default:
229229
WARNLOG("Invalid creature state in torture room");
230-
cctrl->tortured.gameturn_9Ex = game.play_gameturn;
230+
cctrl->tortured.state_start_turn = game.play_gameturn;
231231
cctrl->tortured.vis_state = CTVS_TortureGoToDevice;
232232
break;
233233
}

‎src/creature_states_wrshp.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ struct Thing *get_other_creature_manufacturing_on_subtile(PlayerNumber plyr_idx,
135135
if (thing_is_creature(thing) && (thing->active_state == CrSt_Manufacturing) && (thing->index != othertng->index))
136136
{
137137
struct CreatureControl* cctrl = creature_control_get_from_thing(thing);
138-
if ((cctrl->workshop.byte_9A > 1) && (thing->owner == plyr_idx)) {
138+
if ((cctrl->workshop.job_stage > 1) && (thing->owner == plyr_idx)) {
139139
return thing;
140140
}
141141
}
@@ -193,7 +193,7 @@ TbBool setup_move_to_new_workshop_position(struct Thing *thing, struct Room *roo
193193
struct CreatureControl* cctrl = creature_control_get_from_thing(thing);
194194
if ( a3 )
195195
cctrl->workshop.byte_9E = 50;
196-
cctrl->workshop.byte_9A = 1;
196+
cctrl->workshop.job_stage = 1;
197197
SubtlCodedCoords stl_num = find_position_around_in_room(&thing->mappos, thing->owner, room->kind, thing);
198198
if (stl_num <= 0)
199199
{
@@ -287,8 +287,8 @@ long process_creature_in_workshop(struct Thing *creatng, struct Room *room)
287287
long mvret;
288288
MapSlabCoord slb_x;
289289
MapSlabCoord slb_y;
290-
SYNCDBG(19,"Work in %s, the %s in state %d",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.byte_9A);
291-
switch (cctrl->workshop.byte_9A)
290+
SYNCDBG(19,"Work in %s, the %s in state %d",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.job_stage);
291+
switch (cctrl->workshop.job_stage)
292292
{
293293
case 1:
294294
cctrl->workshop.byte_9E--;
@@ -302,7 +302,7 @@ long process_creature_in_workshop(struct Thing *creatng, struct Room *room)
302302
if (mvret != 1)
303303
{
304304
if (mvret == -1) {
305-
SYNCDBG(9,"Room %s move problem, the %s goes from %d to start state",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.byte_9A);
305+
SYNCDBG(9,"Room %s move problem, the %s goes from %d to start state",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.job_stage);
306306
set_start_state(creatng);
307307
}
308308
break;
@@ -313,12 +313,12 @@ long process_creature_in_workshop(struct Thing *creatng, struct Room *room)
313313
objtng = get_workshop_equipment_to_work_with_on_subtile(creatng->owner, slab_subtile_center(slb_x),slab_subtile_center(slb_y));
314314
if (!thing_is_invalid(objtng))
315315
{
316-
SYNCDBG(19,"Got %s post, the %s goes from %d to 2",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.byte_9A);
317-
cctrl->workshop.byte_9A = 2;
316+
SYNCDBG(19,"Got %s post, the %s goes from %d to 2",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.job_stage);
317+
cctrl->workshop.job_stage = 2;
318318
cctrl->workshop.byte_9E = 100;
319319
break;
320320
}
321-
SYNCDBG(19,"No %s post at current pos, the %s goes from %d to search position",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.byte_9A);
321+
SYNCDBG(19,"No %s post at current pos, the %s goes from %d to search position",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.job_stage);
322322
setup_move_to_new_workshop_position(creatng, room, 0);
323323
break;
324324
case 2:
@@ -331,11 +331,11 @@ long process_creature_in_workshop(struct Thing *creatng, struct Room *room)
331331
cctrl->workshop.stl_x = slab_subtile_center(slb_x);
332332
cctrl->workshop.stl_y = slab_subtile_center(slb_y);
333333
setup_workshop_move(creatng, stl_num);
334-
cctrl->workshop.byte_9A = 3;
334+
cctrl->workshop.job_stage = 3;
335335
break;
336336
}
337337
setup_move_to_new_workshop_position(creatng, room, 1);
338-
SYNCDBG(9,"No free adjacent %s post, the %s goes from %d to search position",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.byte_9A);
338+
SYNCDBG(9,"No free adjacent %s post, the %s goes from %d to search position",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.job_stage);
339339
break;
340340
}
341341
case 3:
@@ -344,19 +344,19 @@ long process_creature_in_workshop(struct Thing *creatng, struct Room *room)
344344
if (mvret != 1)
345345
{
346346
if (mvret == -1) {
347-
SYNCDBG(9,"Room %s move problem, the %s goes from %d to start state",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.byte_9A);
347+
SYNCDBG(9,"Room %s move problem, the %s goes from %d to start state",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.job_stage);
348348
set_start_state(creatng);
349349
}
350350
break;
351351
}
352352
struct Thing *mnfc_creatng;
353353
mnfc_creatng = get_other_creature_manufacturing_on_subtile(creatng->owner, creatng->mappos.x.stl.num, creatng->mappos.y.stl.num, creatng);
354354
if (thing_is_invalid(mnfc_creatng)) {
355-
cctrl->workshop.byte_9A = 4;
355+
cctrl->workshop.job_stage = 4;
356356
break;
357357
}
358358
// Position used by another manufacturer
359-
SYNCDBG(9,"The %s post already in use, the %s goes from %d to search position",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.byte_9A);
359+
SYNCDBG(9,"The %s post already in use, the %s goes from %d to search position",room_code_name(room->kind),thing_model_name(creatng),(int)cctrl->workshop.job_stage);
360360
setup_move_to_new_workshop_position(creatng, room, 1);
361361
break;
362362
}
@@ -367,7 +367,7 @@ long process_creature_in_workshop(struct Thing *creatng, struct Room *room)
367367
pos.y.val = subtile_coord_center(cctrl->workshop.stl_y);
368368
if (creature_turn_to_face(creatng, &pos) < LbFPMath_PI/18)
369369
{
370-
cctrl->workshop.byte_9A = 5;
370+
cctrl->workshop.job_stage = 5;
371371
cctrl->workshop.swing_weapon_counter = 75;
372372
}
373373
break;
@@ -377,7 +377,7 @@ long process_creature_in_workshop(struct Thing *creatng, struct Room *room)
377377
cctrl->workshop.swing_weapon_counter--;
378378
if (cctrl->workshop.swing_weapon_counter <= 0)
379379
{
380-
SYNCDBG(9,"Room %s move counter %d, the %s keeps moving in state %d",room_code_name(room->kind),(int)cctrl->workshop.swing_weapon_counter,thing_model_name(creatng),(int)cctrl->workshop.byte_9A);
380+
SYNCDBG(9,"Room %s move counter %d, the %s keeps moving in state %d",room_code_name(room->kind),(int)cctrl->workshop.swing_weapon_counter,thing_model_name(creatng),(int)cctrl->workshop.job_stage);
381381
setup_move_to_new_workshop_position(creatng, room, 1);
382382
} else
383383
if ((cctrl->workshop.swing_weapon_counter % 8) == 0) {

‎src/thing_creature.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3375,10 +3375,6 @@ struct Thing *kill_creature(struct Thing *creatng, struct Thing *killertng, Play
33753375
struct CreatureStats *crstat = creature_stats_get_from_thing(killertng);
33763376
anger_apply_anger_to_creature(killertng, crstat->annoy_win_battle, AngR_Other, 1);
33773377
}
3378-
if (!creature_control_invalid(cctrlgrp) && flag_is_set(flags, CrDed_DiedInBattle))
3379-
{
3380-
cctrlgrp->unknown_state.byte_9A++;
3381-
}
33823378
if (!dungeon_invalid(dungeon))
33833379
{
33843380
dungeon->hates_player[killertng->owner] += game.conf.rules.creature.fight_hate_kill_value;

0 commit comments

Comments
 (0)