Skip to content
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

Jump to bottom

Replace sprintf with snprintf in the merc missions. #266

Merged
merged 1 commit into from
May 2, 2024
Merged

Replace sprintf with snprintf in the merc missions. #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/Merc02.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,7 +1694,7 @@ char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
int lang_type;
if (func_list->script_identifier != NULL) {
_splitpath(func_list->script_identifier, NULL, NULL, filename, NULL);
sprintf(english_filename, "%s.msg", filename);
snprintf(english_filename, sizeof(english_filename), "%s.msg", filename);
lang_type = Game_GetLanguage();
if (lang_type == LANGUAGE_FRENCH)
strcat(filename, "_FRN");
Expand Down
2 changes: 1 addition & 1 deletion scripts/Merc1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2254,7 +2254,7 @@ char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
int lang_type;
if (func_list->script_identifier != NULL) {
_splitpath(func_list->script_identifier, NULL, NULL, filename, NULL);
sprintf(english_filename, "%s.msg", filename);
snprintf(english_filename, sizeof(english_filename), "%s.msg", filename);
lang_type = Game_GetLanguage();
if (lang_type == LANGUAGE_FRENCH)
strcat(filename, "_FRN");
Expand Down
16 changes: 8 additions & 8 deletions scripts/Merc3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,7 @@ void cGravityRoomBoxStates(int gravity_room, int gravity_type) {
sbyte cur_box_state = Gravity_room_box_states[gravity_room - 1][i - 1];

if ((gravity_type != cur_box_state) || (gravity_type == cur_box_state && gravity_type == G_NONE)) {
sprintf(objname, "r%dBox%d", gravity_room, i);
snprintf(objname, sizeof(objname), "r%dBox%d", gravity_room, i);
handle = Scrpt_FindObjectName(objname);

if (handle > OBJECT_HANDLE_NONE) {
Expand Down Expand Up @@ -1856,7 +1856,7 @@ void cUpdateGravityRoomBoxStates(int gravity_room) {
char objname[64];
sbyte cur_box_state = Gravity_room_box_states[gravity_room - 1][i - 1];
if (cur_box_state == G_NONE) {
sprintf(objname, "r%dBox%d", gravity_room, i);
snprintf(objname, sizeof(objname), "r%dBox%d", gravity_room, i);
handle = Scrpt_FindObjectName(objname);

if (handle > OBJECT_HANDLE_NONE) {
Expand Down Expand Up @@ -1898,7 +1898,7 @@ void cOffAIForSharksInRoom(int state, int room_n) {
int handle;
char objname[64];

sprintf(objname, "SecShark%d-%d", room_n, i + 1);
snprintf(objname, sizeof(objname), "SecShark%d-%d", room_n, i + 1);
handle = Scrpt_FindObjectName(objname);

if (handle >= OBJECT_HANDLE_NONE) {
Expand Down Expand Up @@ -1926,7 +1926,7 @@ void cSetSharkTarget(int room_n, int objhandle) {
int handle;
char objname[64];

sprintf(objname, "SecShark%d-%d", room_n, i + 1);
snprintf(objname, sizeof(objname), "SecShark%d-%d", room_n, i + 1);
handle = Scrpt_FindObjectName(objname);

if (handle >= OBJECT_HANDLE_NONE) {
Expand Down Expand Up @@ -2255,15 +2255,15 @@ void cEndSequenceFrame(int playerobj) {
// get handle of object
switch (fx_type) {
case 0:
sprintf(name, "X%d %c", exit_room_info[r].room_number, cmds[c]);
snprintf(name, sizeof(name), "X%d %c", exit_room_info[r].room_number, cmds[c]);
break;
case 1:
case 2:
case 3:
sprintf(name, "X%d Spew %c", exit_room_info[r].room_number, cmds[c]);
snprintf(name, sizeof(name), "X%d Spew %c", exit_room_info[r].room_number, cmds[c]);
break;
case 4:
sprintf(name, "X%d Sparks%c", exit_room_info[r].room_number, cmds[c]);
snprintf(name, sizeof(name), "X%d Sparks%c", exit_room_info[r].room_number, cmds[c]);
break;
default:
name[0] = 0;
Expand Down Expand Up @@ -2989,7 +2989,7 @@ char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
int lang_type;
if (func_list->script_identifier != NULL) {
_splitpath(func_list->script_identifier, NULL, NULL, filename, NULL);
sprintf(english_filename, "%s.msg", filename);
snprintf(english_filename, sizeof(english_filename), "%s.msg", filename);
lang_type = Game_GetLanguage();
if (lang_type == LANGUAGE_FRENCH)
strcat(filename, "_FRN");
Expand Down