mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2025-12-06 16:12:42 +00:00
Correct inconsistent function name
This commit is contained in:
parent
06eddafc27
commit
67d3975980
8 changed files with 23 additions and 12 deletions
|
|
@ -5,6 +5,13 @@ FONT_TINY = -1
|
||||||
ANIM_FLAG_FORWARD = (1 << 1)
|
ANIM_FLAG_FORWARD = (1 << 1)
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------
|
||||||
|
-- Renamed functions --
|
||||||
|
-----------------------
|
||||||
|
|
||||||
|
rom_hack_cam_set_collisions = camera_romhack_set_collisions
|
||||||
|
|
||||||
|
|
||||||
--------------------
|
--------------------
|
||||||
-- Math functions --
|
-- Math functions --
|
||||||
--------------------
|
--------------------
|
||||||
|
|
|
||||||
|
|
@ -10301,7 +10301,7 @@ end
|
||||||
|
|
||||||
--- @param enable integer
|
--- @param enable integer
|
||||||
--- Toggles collision settings for the ROM hack camera. This enables or disables specific collision behaviors in modded levels
|
--- Toggles collision settings for the ROM hack camera. This enables or disables specific collision behaviors in modded levels
|
||||||
function rom_hack_cam_set_collisions(enable)
|
function camera_romhack_set_collisions(enable)
|
||||||
-- ...
|
-- ...
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6240,13 +6240,13 @@ Sets if the romhack camera should allow D-Pad movement
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
## [rom_hack_cam_set_collisions](#rom_hack_cam_set_collisions)
|
## [camera_romhack_set_collisions](#camera_romhack_set_collisions)
|
||||||
|
|
||||||
### Description
|
### Description
|
||||||
Toggles collision settings for the ROM hack camera. This enables or disables specific collision behaviors in modded levels
|
Toggles collision settings for the ROM hack camera. This enables or disables specific collision behaviors in modded levels
|
||||||
|
|
||||||
### Lua Example
|
### Lua Example
|
||||||
`rom_hack_cam_set_collisions(enable)`
|
`camera_romhack_set_collisions(enable)`
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
| Field | Type |
|
| Field | Type |
|
||||||
|
|
@ -6257,7 +6257,7 @@ Toggles collision settings for the ROM hack camera. This enables or disables spe
|
||||||
- None
|
- None
|
||||||
|
|
||||||
### C Prototype
|
### C Prototype
|
||||||
`void rom_hack_cam_set_collisions(u8 enable);`
|
`void camera_romhack_set_collisions(u8 enable);`
|
||||||
|
|
||||||
[:arrow_up_small:](#)
|
[:arrow_up_small:](#)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1847,7 +1847,7 @@
|
||||||
- [camera_romhack_allow_centering](functions-6.md#camera_romhack_allow_centering)
|
- [camera_romhack_allow_centering](functions-6.md#camera_romhack_allow_centering)
|
||||||
- [camera_allow_toxic_gas_camera](functions-6.md#camera_allow_toxic_gas_camera)
|
- [camera_allow_toxic_gas_camera](functions-6.md#camera_allow_toxic_gas_camera)
|
||||||
- [camera_romhack_allow_dpad_usage](functions-6.md#camera_romhack_allow_dpad_usage)
|
- [camera_romhack_allow_dpad_usage](functions-6.md#camera_romhack_allow_dpad_usage)
|
||||||
- [rom_hack_cam_set_collisions](functions-6.md#rom_hack_cam_set_collisions)
|
- [camera_romhack_set_collisions](functions-6.md#camera_romhack_set_collisions)
|
||||||
- [camera_romhack_set_zoomed_in_dist](functions-6.md#camera_romhack_set_zoomed_in_dist)
|
- [camera_romhack_set_zoomed_in_dist](functions-6.md#camera_romhack_set_zoomed_in_dist)
|
||||||
- [camera_romhack_set_zoomed_out_dist](functions-6.md#camera_romhack_set_zoomed_out_dist)
|
- [camera_romhack_set_zoomed_out_dist](functions-6.md#camera_romhack_set_zoomed_out_dist)
|
||||||
- [camera_romhack_set_zoomed_in_height](functions-6.md#camera_romhack_set_zoomed_in_height)
|
- [camera_romhack_set_zoomed_in_height](functions-6.md#camera_romhack_set_zoomed_in_height)
|
||||||
|
|
|
||||||
|
|
@ -425,6 +425,10 @@ char gSmluaConstants[] = ""
|
||||||
"FONT_TINY = -1\n"
|
"FONT_TINY = -1\n"
|
||||||
"--- @type integer\n"
|
"--- @type integer\n"
|
||||||
"ANIM_FLAG_FORWARD = (1 << 1)\n"
|
"ANIM_FLAG_FORWARD = (1 << 1)\n"
|
||||||
|
"-----------------------\n"
|
||||||
|
"-- Renamed functions --\n"
|
||||||
|
"-----------------------\n"
|
||||||
|
"rom_hack_cam_set_collisions = camera_romhack_set_collisions\n"
|
||||||
"--------------------\n"
|
"--------------------\n"
|
||||||
"-- Math functions --\n"
|
"-- Math functions --\n"
|
||||||
"--------------------\n"
|
"--------------------\n"
|
||||||
|
|
|
||||||
|
|
@ -31154,19 +31154,19 @@ int smlua_func_camera_romhack_allow_dpad_usage(lua_State* L) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int smlua_func_rom_hack_cam_set_collisions(lua_State* L) {
|
int smlua_func_camera_romhack_set_collisions(lua_State* L) {
|
||||||
if (L == NULL) { return 0; }
|
if (L == NULL) { return 0; }
|
||||||
|
|
||||||
int top = lua_gettop(L);
|
int top = lua_gettop(L);
|
||||||
if (top != 1) {
|
if (top != 1) {
|
||||||
LOG_LUA_LINE("Improper param count for '%s': Expected %u, Received %u", "rom_hack_cam_set_collisions", 1, top);
|
LOG_LUA_LINE("Improper param count for '%s': Expected %u, Received %u", "camera_romhack_set_collisions", 1, top);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 enable = smlua_to_integer(L, 1);
|
u8 enable = smlua_to_integer(L, 1);
|
||||||
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "rom_hack_cam_set_collisions"); return 0; }
|
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "camera_romhack_set_collisions"); return 0; }
|
||||||
|
|
||||||
rom_hack_cam_set_collisions(enable);
|
camera_romhack_set_collisions(enable);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
@ -38606,7 +38606,7 @@ void smlua_bind_functions_autogen(void) {
|
||||||
smlua_bind_function(L, "camera_romhack_allow_centering", smlua_func_camera_romhack_allow_centering);
|
smlua_bind_function(L, "camera_romhack_allow_centering", smlua_func_camera_romhack_allow_centering);
|
||||||
smlua_bind_function(L, "camera_allow_toxic_gas_camera", smlua_func_camera_allow_toxic_gas_camera);
|
smlua_bind_function(L, "camera_allow_toxic_gas_camera", smlua_func_camera_allow_toxic_gas_camera);
|
||||||
smlua_bind_function(L, "camera_romhack_allow_dpad_usage", smlua_func_camera_romhack_allow_dpad_usage);
|
smlua_bind_function(L, "camera_romhack_allow_dpad_usage", smlua_func_camera_romhack_allow_dpad_usage);
|
||||||
smlua_bind_function(L, "rom_hack_cam_set_collisions", smlua_func_rom_hack_cam_set_collisions);
|
smlua_bind_function(L, "camera_romhack_set_collisions", smlua_func_camera_romhack_set_collisions);
|
||||||
smlua_bind_function(L, "camera_romhack_set_zoomed_in_dist", smlua_func_camera_romhack_set_zoomed_in_dist);
|
smlua_bind_function(L, "camera_romhack_set_zoomed_in_dist", smlua_func_camera_romhack_set_zoomed_in_dist);
|
||||||
smlua_bind_function(L, "camera_romhack_set_zoomed_out_dist", smlua_func_camera_romhack_set_zoomed_out_dist);
|
smlua_bind_function(L, "camera_romhack_set_zoomed_out_dist", smlua_func_camera_romhack_set_zoomed_out_dist);
|
||||||
smlua_bind_function(L, "camera_romhack_set_zoomed_in_height", smlua_func_camera_romhack_set_zoomed_in_height);
|
smlua_bind_function(L, "camera_romhack_set_zoomed_in_height", smlua_func_camera_romhack_set_zoomed_in_height);
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ void camera_romhack_allow_dpad_usage(u8 allow) {
|
||||||
gRomhackCameraSettings.dpad = allow;
|
gRomhackCameraSettings.dpad = allow;
|
||||||
}
|
}
|
||||||
|
|
||||||
void rom_hack_cam_set_collisions(u8 enable) {
|
void camera_romhack_set_collisions(u8 enable) {
|
||||||
gRomhackCameraSettings.collisions = enable;
|
gRomhackCameraSettings.collisions = enable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ void camera_romhack_allow_dpad_usage(u8 allow);
|
||||||
Toggles collision settings for the ROM hack camera.
|
Toggles collision settings for the ROM hack camera.
|
||||||
This enables or disables specific collision behaviors in modded levels
|
This enables or disables specific collision behaviors in modded levels
|
||||||
|descriptionEnd| */
|
|descriptionEnd| */
|
||||||
void rom_hack_cam_set_collisions(u8 enable);
|
void camera_romhack_set_collisions(u8 enable);
|
||||||
|
|
||||||
/* |description|Sets the romhack camera's zoomed in distance (Default: 900)|descriptionEnd| */
|
/* |description|Sets the romhack camera's zoomed in distance (Default: 900)|descriptionEnd| */
|
||||||
void camera_romhack_set_zoomed_in_dist(u32 val);
|
void camera_romhack_set_zoomed_in_dist(u32 val);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue