etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 05:25:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing smlua_level_util_get_info_from_short_name typing and bug reintroduced by commit cc4f4e9 - Instant Warp Function (#494)

Browse source
This commit is contained in:
U-DESKTOP-F0TJMO2\Utilisateur 2023-10-30 12:44:41 +01:00 committed by Agent X
parent f4b08ddf52
commit 0b53dbcdbd
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/lua/functions-4.md
View file

@ -7920,7 +7920,7 @@
[CustomLevelInfo](structs.md#CustomLevelInfo)
### C Prototype
`struct CustomLevelInfo* smlua_level_util_get_info_from_short_name(char* shortName);`
`struct CustomLevelInfo* smlua_level_util_get_info_from_short_name(const char* shortName);`
[:arrow_up_small:](#)

2
src/game/ingame_menu.c
View file

@ -490,7 +490,7 @@ u8 str_ascii_char_to_dialog(char c) {
}
void str_ascii_to_dialog(const char* string, u8* dialog, u16 length) {
char* c = (char*) string;
const char* c = string;
u8* d = dialog;
u16 converted = 0;

2
src/game/level_info.c
View file

@ -249,7 +249,7 @@ const char *get_level_name_ascii(s16 courseNum, s16 levelNum, s16 areaIndex, s16
const u8 *get_level_name_sm64(s16 courseNum, s16 levelNum, s16 areaIndex, s16 charCase) {
static u8 output[256];
char levelName[256];
snprintf(levelName, 256, " %d %s", courseNum, (char*) get_level_name_ascii(courseNum, levelNum, areaIndex, charCase));
snprintf(levelName, 256, " %d %s", courseNum, get_level_name_ascii(courseNum, levelNum, areaIndex, charCase));
convert_string_ascii_to_sm64(output, levelName);
return output;
}

4
src/pc/chat_commands.c
View file

@ -16,7 +16,7 @@
static enum ChatConfirmCommand sConfirming = CCC_NONE;
static u8 sConfirmPlayerIndex = 0;
static struct NetworkPlayer* chat_get_network_player(char* name) {
static struct NetworkPlayer* chat_get_network_player(const char* name) {
// check for id
for (s32 i = 0; i < MAX_PLAYERS; i++) {
if (!gNetworkPlayers[i].connected) { continue; }
@ -39,7 +39,7 @@ static struct NetworkPlayer* chat_get_network_player(char* name) {
return NULL;
}
static bool str_starts_with(const char* pre, char* str) {
static bool str_starts_with(const char* pre, const char* str) {
return strncmp(pre, str, strlen(pre)) == 0;
}

8
src/pc/debuglog.h
View file

@ -22,12 +22,12 @@ static void _debuglog_print_network_type(void) {
printf(" [%02d] ", (gNetworkPlayerLocal != NULL) ? gNetworkPlayerLocal->globalIndex : -1);
}
static void _debuglog_print_log_type(char* logType) {
static void _debuglog_print_log_type(const char* logType) {
printf("[%s] ", logType);
}
static void _debuglog_print_short_filename(char* filename) {
char* last = strrchr(filename, '/');
static void _debuglog_print_short_filename(const char* filename) {
const char* last = strrchr(filename, '/');
if (last != NULL) {
printf("%s: ", last + 1);
}
@ -36,7 +36,7 @@ static void _debuglog_print_short_filename(char* filename) {
}
}
static void _debuglog_print_log(char* logType, char* filename) {
static void _debuglog_print_log(const char* logType, char* filename) {
_debuglog_print_timestamp();
_debuglog_print_network_type();
_debuglog_print_log_type(logType);

2
src/pc/lua/smlua_functions_autogen.c
View file

@ -27731,7 +27731,7 @@ int smlua_func_smlua_level_util_get_info_from_short_name(lua_State* L) {
return 0;
}
char* shortName = (char*)smlua_to_cobject(L, 1, LOT_NONE);
const char* shortName = smlua_to_string(L, 1);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "smlua_level_util_get_info_from_short_name"); return 0; }
smlua_push_object(L, LOT_CUSTOMLEVELINFO, smlua_level_util_get_info_from_short_name(shortName));

8
src/pc/lua/utils/smlua_level_utils.c
View file

@ -51,7 +51,7 @@ struct CustomLevelInfo* smlua_level_util_get_info(s16 levelNum) {
return NULL;
}
struct CustomLevelInfo* smlua_level_util_get_info_from_short_name(char* shortName) {
struct CustomLevelInfo* smlua_level_util_get_info_from_short_name(const char* shortName) {
struct CustomLevelInfo* node = sCustomLevelHead;
while (node != NULL) {
if (!strcmp(node->shortName, shortName)) {
@ -62,7 +62,7 @@ struct CustomLevelInfo* smlua_level_util_get_info_from_short_name(char* shortNam
return NULL;
}
static struct CustomLevelInfo* smlua_level_util_get_info_from_script(char* scriptEntryName) {
static struct CustomLevelInfo* smlua_level_util_get_info_from_script(const char* scriptEntryName) {
struct CustomLevelInfo* node = sCustomLevelHead;
while (node != NULL) {
if (!strcmp(node->scriptEntryName, scriptEntryName)) {
@ -102,13 +102,13 @@ s16 level_register(const char* scriptEntryName, s16 courseNum, const char* fullN
}
// find duplicate
struct CustomLevelInfo* info = smlua_level_util_get_info_from_script((char*)scriptEntryName);
struct CustomLevelInfo* info = smlua_level_util_get_info_from_script(scriptEntryName);
if (info != NULL) {
return info->levelNum;
}
// find script
LevelScript* script = dynos_get_level_script((char*)scriptEntryName);
LevelScript* script = dynos_get_level_script(scriptEntryName);
if (script == NULL) {
LOG_LUA("Failed to find script: %s", scriptEntryName);
return 0;

2
src/pc/lua/utils/smlua_level_utils.h
View file

@ -21,7 +21,7 @@ struct CustomLevelInfo {
void smlua_level_util_reset(void);
void smlua_level_util_change_area(s32 areaIndex);
struct CustomLevelInfo* smlua_level_util_get_info(s16 levelNum);
struct CustomLevelInfo* smlua_level_util_get_info_from_short_name(char* shortName);
struct CustomLevelInfo* smlua_level_util_get_info_from_short_name(const char* shortName);
struct CustomLevelInfo* smlua_level_util_get_info_from_course_num(u8 courseNum);
s16 level_register(const char* scriptEntryName, s16 courseNum, const char* fullName, const char* shortName, u32 acousticReach, u32 echoLevel1, u32 echoLevel2, u32 echoLevel3);
bool level_is_vanilla_level(s16 levelNum);