thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fully fix 1.3 script errors and other stuff [build]
Some checks are pending
Build coop / build-linux (push) Waiting to run
Details
Build coop / build-steamos (push) Waiting to run
Details
Build coop / build-windows-opengl (push) Waiting to run
Details
Build coop / build-windows-directx (push) Waiting to run
Details
Build coop / build-macos-arm (push) Waiting to run
Details
Build coop / build-macos-intel (push) Waiting to run
Details

Browse source
This commit is contained in:
Agent X 2025-05-04 21:48:03 -04:00
parent 6f6cbc3413
commit 6d1f533113
5 changed files with 8 additions and 551 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autogen/convert_functions.py
View file

@ -892,9 +892,7 @@ def build_param(fid, param, i):
else: else:
s = ' ' + s s = ' ' + s
sanity_check = ' if (lua_isnil(L, %d)) { return 0; }\n' % (i) return s + '\n'
return sanity_check + s + '\n'
def build_param_after(param, i): def build_param_after(param, i):
ptype = param['type'] ptype = param['type']

2
src/pc/djui/djui_panel_mod_menu.c
View file

@ -116,7 +116,7 @@ void djui_panel_mod_menu_mod_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(to_uppercase(mod->name), false); struct DjuiThreePanel* panel = djui_panel_menu_create(to_uppercase(mod->name), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiPaginated* paginated = djui_paginated_create(body, 8); struct DjuiPaginated* paginated = djui_paginated_create(body, 7);
struct DjuiBase* layoutBase = &paginated->layout->base; struct DjuiBase* layoutBase = &paginated->layout->base;
s32 count = 0; s32 count = 0;
for (int i = 0; i < gHookedModMenuElementsCount; i++) { for (int i = 0; i < gHookedModMenuElementsCount; i++) {

2
src/pc/djui/djui_panel_rules.c
View file

@ -35,7 +35,7 @@ void djui_panel_rules_create(struct DjuiBase* caller) {
struct DjuiText* text1 = djui_text_create(body, sRules); struct DjuiText* text1 = djui_text_create(body, sRules);
djui_base_set_location(&text1->base, 0, 0); djui_base_set_location(&text1->base, 0, 0);
djui_base_set_size(&text1->base, (DJUI_DEFAULT_PANEL_WIDTH * (configDjuiThemeCenter ? DJUI_THEME_CENTERED_WIDTH : 1)) - 64, 11 * 30); djui_base_set_size(&text1->base, (DJUI_DEFAULT_PANEL_WIDTH * (configDjuiThemeCenter ? DJUI_THEME_CENTERED_WIDTH : 1)) - 64, 12 * 30);
djui_base_set_color(&text1->base, 220, 220, 220, 255); djui_base_set_color(&text1->base, 220, 220, 220, 255);
djui_text_set_drop_shadow(text1, 64, 64, 64, 100); djui_text_set_drop_shadow(text1, 64, 64, 64, 100);
djui_text_set_alignment(text1, DJUI_HALIGN_LEFT, DJUI_VALIGN_TOP); djui_text_set_alignment(text1, DJUI_HALIGN_LEFT, DJUI_VALIGN_TOP);

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

File diff suppressed because it is too large Load diff

7
src/pc/lua/smlua_utils.c
View file

@ -151,8 +151,11 @@ bool smlua_is_cobject(lua_State* L, int index, UNUSED u16 lot) {
void* smlua_to_cobject(lua_State* L, int index, u16 lot) { void* smlua_to_cobject(lua_State* L, int index, u16 lot) {
s32 indexType = lua_type(L, index); s32 indexType = lua_type(L, index);
if (indexType != LUA_TUSERDATA) { if (indexType != LUA_TUSERDATA) {
LOG_LUA_LINE("smlua_to_cobject received improper type '%s'", lua_typename(L, indexType)); // suppress script errors
gSmLuaConvertSuccess = false; if (indexType != LUA_TNIL) {
LOG_LUA_LINE("smlua_to_cobject received improper type '%s'", lua_typename(L, indexType));
gSmLuaConvertSuccess = false;
}
return NULL; return NULL;
} }