Skip to content

Unbind sequential properties and script text limits #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DCurrent merged 11 commits into from
Aug 12, 2026
Merged

Unbind sequential properties and script text limits #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9e742a2
Read sequential properties one argument at a time
DCurrent Aug 11, 2026
3ee00c9
Unbind allowselect from fixed storage
DCurrent Aug 11, 2026
7a46fd6
Remove legacy allowselect save storage
DCurrent Aug 11, 2026
4a34d6d
Read file stream arguments sequentially
DCurrent Aug 11, 2026
663db0c
Read @cmd arguments sequentially
DCurrent Aug 11, 2026
0a89e1d
Unbind script string literal length
DCurrent Aug 11, 2026
8d1de7a
Harden script string conversion
DCurrent Aug 12, 2026
40afed1
Unbind script text display
DCurrent Aug 12, 2026
511b71f
Decode quoted command arguments
DCurrent Aug 12, 2026
2db4ae4
Verify @cmd quotation clousure and reject malformed arguments with gr…
DCurrent Aug 12, 2026
9bdd047
Guard @cmd compatibility merging
DCurrent Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,615 changes: 1,230 additions & 385 deletions engine/openbor.c
View file
Open in desktop

Large diffs are not rendered by default.

65 changes: 44 additions & 21 deletions engine/openbor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ typedef uint64_t key_mask_t;
"Special thanks to SEGA and SNK.\n\n"

#define COMPATIBLEVERSION 0x00033749
#define CV_SAVED_GAME 0x00033747
#define CV_SAVED_GAME 0x00033748
#define CV_HIGH_SCORE 0x00033747
#define GAME_SPEED_DEFAULT 200
#define THINK_SPEED 2
Expand Down Expand Up @@ -123,7 +123,6 @@ typedef uint64_t key_mask_t;
#define MAX_COLLISIONS 2 // Collision boxes.
#define MAX_RECURSIVE_EFFECTS 64 // Max number of recursive effects on an entity at a time.
#define MAX_ARG_LEN 512
#define MAX_ALLOWSELECT_LEN 1024
#define MAX_SELECT_LOADS 512
#define MAX_PAL_SIZE 1024
#define MAX_CACHED_BACKGROUNDS 9
Expand Down Expand Up @@ -4353,13 +4352,13 @@ void unfrozen(entity *e);
/* Defense. */
int calculate_force_damage(entity* target, entity* attacker, s_attack* attack_object, const s_defense* defense_object, const bool blocked);
s_defense* defense_allocate_object(void);
void defense_apply_setup_to_property(char* filename, char* command, s_defense* defense, ArgList* arglist, e_defense_parameters target_parameter);
void defense_apply_setup_to_property(char* filename, char* command, const char* command_line, s_defense* defense, ArgList* arglist, e_defense_parameters target_parameter);
void defense_dump_object(const s_defense* target);
void defense_free_object(s_defense* target);
const s_defense* defense_find_current_object(const entity* ent, const s_body* body_object, const attack_type_t attack_type);
int64_t defense_result_damage(const s_defense* defense_object, int64_t attack_force, bool blocked);
int defense_result_pain(s_attack* attack_object, const s_defense* defense_object);
void defense_setup_from_arg(char* filename, char* command, s_defense* defense, ArgList* arglist, e_defense_parameters target_parameter);
void defense_setup_from_arg(char* filename, char* command, const char* command_line, s_defense* defense, ArgList* arglist, e_defense_parameters target_parameter);

s_offense* offense_allocate_object(void);
void offense_free_object(s_offense* target);
Expand All @@ -4372,11 +4371,11 @@ s_recursive_effect* recursive_effect_allocate_object(void);
void recursive_effect_check_apply(entity* ent, entity* other, s_attack* attack);
void recursive_effect_dump_object(s_recursive_effect* recursive);
void recursive_effect_free_object(s_recursive_effect* target);
e_damage_recursive_logic recursive_effect_get_mode_setup_from_arg_list(ArgList* arglist);
e_damage_recursive_logic recursive_effect_get_mode_setup_from_command_line(const char* command_line);
e_damage_recursive_logic recursive_effect_get_mode_setup_from_legacy_argument(e_damage_recursive_cmd_read value);

/* Blocking logic. */
e_block_config_flags block_get_config_flags_from_arguments(const ArgList* arglist);
e_block_config_flags block_get_config_flags_from_command_line(const char* command_line);
e_block_config_flags block_get_config_flag_from_string(const char* value);
bool check_blocking_decision(entity *ent);
bool check_blocking_eligible(entity *ent, entity *other, s_attack *attack, s_body* body, e_block_state_flags block_state);
Expand Down Expand Up @@ -4411,6 +4410,32 @@ int prevcolourmapn (s_model *model, int map_index, int player_index);
int buffer_pakfile (const char *filename, char **pbuffer, size_t *psize);

size_t ParseArgs (ArgList *list, char *input, char *output);

/*
- Caskey, Damon V.
- 2026-08-11
-
- Describe one sequential command argument as a source view
and its decoded length. Quote delimiters remain in the source
view so callers can scan without allocation, then discard the
delimiters while copying into correctly sized owned storage.
*/
typedef enum e_command_argument_read_result
{
COMMAND_ARGUMENT_READ_END,
COMMAND_ARGUMENT_READ_SUCCESS,
COMMAND_ARGUMENT_READ_INVALID
} e_command_argument_read_result;

typedef struct s_command_argument_view
{
const char* source;
size_t source_length;
size_t length;
} s_command_argument_view;

e_command_argument_read_result command_argument_read(const char* command_line, size_t argument_index, s_command_argument_view* argument);
bool command_argument_copy (const s_command_argument_view* argument, char* destination, size_t capacity);
int getsyspropertybyindex (ScriptVariant *var, int index);
int changesyspropertybyindex (int index, ScriptVariant *value);
e_direction direction_get_direction_from_argument(const char* filename, const char* command, const char* value);
Expand Down Expand Up @@ -4460,7 +4485,6 @@ int loadHighScoreFile(void);
int translate_SDID(char *value);
int music(char *filename, int loop, long offset);
int readByte(char* buf);
char *findarg(char *command, int which);
float diff(float a, float b);
int inair(entity *e);
int inair_range(entity *e);
Expand Down Expand Up @@ -4542,7 +4566,7 @@ void faction_copy_data(s_faction* dest, s_faction* source);
bool faction_check_can_damage(entity* acting_entity, entity* target_entity, const bool indirect);
int faction_check_is_hostile(entity* acting_entity, entity* target_entity);
int faction_check_player_verses(entity* acting_entity, entity* target_entity, faction_group_mask_t faction_property);
faction_group_mask_t faction_get_flags_from_arglist(const ArgList* arglist);
faction_group_mask_t faction_get_flags_from_command_line(const char* command_line);
faction_group_mask_t faction_get_flag_from_string(const char* value);

/* Bind control */
Expand All @@ -4559,8 +4583,8 @@ s_child_follow* child_follow_allocate_object();

/* Child spawn control */
int child_spawn_get_color_from_argument(char* filename, char* command, char* value);
e_child_spawn_config child_spawn_get_config_argument(ArgList* arglist, e_child_spawn_config config_current);
e_child_spawn_config child_spawn_get_config_bit_from_argument(char* value);
e_child_spawn_config child_spawn_get_config_argument(const char* command_line, e_child_spawn_config config_current);
e_child_spawn_config child_spawn_get_config_bit_from_argument(const char* value);

s_child_spawn* child_spawn_allocate_object();
s_child_spawn* child_spawn_append_node(struct s_child_spawn* head);
Expand Down Expand Up @@ -4659,7 +4683,7 @@ e_falldie_config death_config_get_falldie_from_value(e_death_config_flags acting
e_death_config_flags death_config_get_value_from_falldie(e_death_config_flags current_value, e_falldie_config acting_value);
e_death_config_flags death_config_get_value_from_nodieblink(e_death_config_flags current_value, e_nodieblink_config acting_value);
e_nodieblink_config death_config_get_nodieblink_from_value(e_death_config_flags acting_value);
e_death_config_flags death_get_config_flags_from_arguments(const ArgList* arglist, int start_position);
e_death_config_flags death_get_config_flags_from_command_line(const char* command_line, size_t start_position);
e_death_config_flags death_get_config_flag_from_string(const char* value);

typedef enum e_death_sequence_acting_event
Expand All @@ -4672,7 +4696,7 @@ int death_try_sequence_damage(entity* acting_entity, e_death_config_flags death_

/* Running */
e_run_config_flags run_get_config_flag_from_string(const char* value);
e_run_config_flags run_get_config_flags_from_arguments(const ArgList* arglist, const uint64_t start_position);
e_run_config_flags run_get_config_flags_from_command_line(const char* command_line, size_t start_position);
void run_try_runstop_player(entity* acting_entity, const s_player* acting_player);
void run_try_runstop_check(entity* acting_entity, const e_RunXDirection movex, const e_RunZDirection movez, const e_RunXDirection running_x, const e_RunZDirection running_z, const int runConfigFlags, const int dashCommandFlag, const int dashFixedFlag, const int enabledFlag, const int stopStateFlag);

Expand All @@ -4682,29 +4706,29 @@ e_shadow_config_flags shadow_get_config_from_legacy_aironly(e_shadow_config_flag
e_shadow_config_flags shadow_get_config_from_legacy_gfxshadow(e_shadow_config_flags shadow_config_flags, int legacy_value);
e_shadow_config_flags shadow_get_config_from_legacy_shadowbase(e_shadow_config_flags shadow_config_flags, e_shadowbase_config legacy_value);
e_shadow_config_flags shadow_get_config_flag_from_string(const char* value);
e_shadow_config_flags shadow_get_config_flags_from_arguments(const ArgList* arglist);
e_shadow_config_flags shadow_get_config_flags_from_command_line(const char* command_line);

// Meta data control.
void meta_data_free_list(s_meta_data* head);

/* Model flag control. */
e_model_copy get_model_flag_from_legacy_int(int legacy_int);
e_model_copy get_model_flag_from_argument(char* filename, char* command, char* value);
void lcmHandleCommandModelFlag(char* filename, char* command, ArgList* arglist, s_model* newchar);
e_model_copy get_model_flag_from_argument(const char* filename, const char* command, const char* value);
void lcmHandleCommandModelFlag(char* filename, char* command, const char* command_line, s_model* newchar);

/* Pain and fall (model) */
e_pain_config_flags pain_get_config_flags_from_arguments(const ArgList* arglist);
e_pain_config_flags pain_get_config_flags_from_command_line(const char* command_line);
e_pain_config_flags pain_get_config_flag_from_string(const char* value);

/* Weapon loss control */
e_weapon_loss_condition get_weapon_loss_from_argument(char* value);
void lcmHandleCommandWeaponLossCondition(ArgList* arglist, s_model* newchar);
e_weapon_loss_condition get_weapon_loss_from_argument(const char* value);
void lcmHandleCommandWeaponLossCondition(const char* command_line, s_model* newchar);

int play_hit_impact_sound(s_attack* attack_object, entity* attacking_entity, int attack_blocked);

void cache_model(char *name, char *path, int flag);
void free_modelcache();
int get_cached_model_index(char *name);
int get_cached_model_index(const char *name);
char *get_cached_model_path(char *name);
s_model *load_cached_model(char *name, char *owner, char unload);
int is_set(s_model *model, int m);
Expand Down Expand Up @@ -4969,7 +4993,7 @@ int ai_check_grab();
int ai_check_escape();
int ai_check_busy();
void display_credits(void);
void borShutdown(int status, char *msg, ...);
void borShutdown(int status, const char *msg, ...);
void startup(void);
int playgif(char *filename, int x, int y, int noskip);
void playscene(char *filename);
Expand Down Expand Up @@ -5036,7 +5060,6 @@ typedef struct
int pColourmap[MAX_PLAYERS]; // colour map

int selectFlag; // saved a select.txt infos
char allowSelectArgs[MAX_ALLOWSELECT_LEN]; // allowselect arguments
char selectMusic[MAX_ARG_LEN]; // select music arguments
char selectBackground[MAX_ARG_LEN]; // select background arguments
char selectLoad[MAX_SELECT_LOADS][MAX_ARG_LEN]; // select load arguments
Expand Down
Loading
Loading