barra
/
SilverMUD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added change-area-name to Scheme, and ensured strings are terminated

This commit is contained in:
Barra Ó Catháin 2023-04-07 22:49:15 +01:00
parent 8d4758bea1
commit ce54fb8033
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/schemeintegration.c
View File

@ -14,6 +14,45 @@ SCM scheme_create_skill(SCM string, SCM skilllist)
return SCM_BOOL_T; return SCM_BOOL_T;
} }
// Change the name of an existing area in a list, given the number of the area in the list, from Scheme:
SCM scheme_change_area_name(SCM newname, SCM areanumber, SCM arealist)
{
// Check if the area exists:
list * areaList = scm_to_pointer(arealist);
size_t areaNumber = scm_to_size_t(areanumber);
if (areaList->type != AREA)
{
return SCM_BOOL_F;
}
playerArea * area = getFromList(areaList, areaNumber)->area;
if (area == NULL)
{
return SCM_BOOL_F;
}
// Create a string from the Scheme string and copy it into the area:
size_t newNameLength = 0;
char * newName = scm_to_locale_stringn(newname, &newNameLength);
memset(area->areaName, 0, 32);
if (newNameLength > 32)
{
memcpy(area->areaName, newName, 31);
area->areaName[31] = '\0';
}
else
{
memcpy(area->areaName, newName, newNameLength);
area->areaName[31] = '\0';
}
free(newName);
return SCM_BOOL_T;
}
// Change the description of an existing area in a list, given the number of the area in the list, from Scheme: // Change the description of an existing area in a list, given the number of the area in the list, from Scheme:
SCM scheme_change_area_description(SCM newdescription, SCM areanumber, SCM arealist) SCM scheme_change_area_description(SCM newdescription, SCM areanumber, SCM arealist)
{ {
@ -40,10 +79,12 @@ SCM scheme_change_area_description(SCM newdescription, SCM areanumber, SCM areal
if (newDescriptionLength > MAX - 35) if (newDescriptionLength > MAX - 35)
{ {
memcpy(area->areaDescription, newDescription, MAX - 35); memcpy(area->areaDescription, newDescription, MAX - 35);
area->areaDescription[MAX - 36] = '\0';
} }
else else
{ {
memcpy(area->areaDescription, newDescription, newDescriptionLength); memcpy(area->areaDescription, newDescription, newDescriptionLength);
area->areaDescription[MAX - 36] = '\0';
} }
free(newDescription); free(newDescription);
@ -92,6 +133,7 @@ void * schemeHandler(void * parameters)
// Register the various functions: // Register the various functions:
scm_c_define_gsubr("create-skill", 2, 0, 0, &scheme_create_skill); scm_c_define_gsubr("create-skill", 2, 0, 0, &scheme_create_skill);
scm_c_define_gsubr("message-everyone", 3, 0, 0, &scheme_message_everyone); scm_c_define_gsubr("message-everyone", 3, 0, 0, &scheme_message_everyone);
scm_c_define_gsubr("change-area-name", 3, 0, 0, &scheme_change_area_name);
scm_c_define_gsubr("change-area-description", 3, 0, 0, &scheme_change_area_description); scm_c_define_gsubr("change-area-description", 3, 0, 0, &scheme_change_area_description);
// Define the various game state pointers as Scheme objects: // Define the various game state pointers as Scheme objects: