mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-07-07 14:13:58 -04:00
fix a problem with cmake and fix animation in menu (#184)
This commit is contained in:
+1
-1
@@ -20,7 +20,7 @@ set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Spaghetti
|
||||
# Add a custom module path to locate additional CMake modules
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
|
||||
include(FindFontconfig)
|
||||
include(CMake/lus-cvars.cmake)
|
||||
include(cmake/lus-cvars.cmake)
|
||||
|
||||
if (WIN32)
|
||||
include(libultraship/cmake/automate-vcpkg.cmake)
|
||||
|
||||
+3
-3
@@ -4514,18 +4514,18 @@ Gfx* func_8009C434(Gfx* arg0, struct_8018DEE0_entry* arg1, s32 arg2, s32 arg3, s
|
||||
if (arg4 >= 0) {
|
||||
arg0 =
|
||||
func_80097E58(arg0, var_t1, 0, 0U, var_s0->width, var_s0->height, var_s0->dX + arg2, var_s0->dY + arg3,
|
||||
(u8*) sMenuTextureList[var_t0], var_s0->width, var_s0->height, (u32) arg4);
|
||||
(u8*) var_s0->textureData, var_s0->width, var_s0->height, (u32) arg4);
|
||||
} else {
|
||||
switch (arg4) {
|
||||
case -1:
|
||||
arg0 = func_80095E10(arg0, var_t1, 0x00000400, 0x00000400, 0, 0, var_s0->width, var_s0->height,
|
||||
var_s0->dX + arg2, var_s0->dY + arg3, (u8*) sMenuTextureList[var_t0],
|
||||
var_s0->dX + arg2, var_s0->dY + arg3, (u8*) var_s0->textureData,
|
||||
var_s0->width, var_s0->height);
|
||||
break;
|
||||
case -2:
|
||||
arg0 = func_800963F0(arg0, var_t1, 0x00000400, 0x00000400, 0.5f, 0.5f, 0, 0, var_s0->width,
|
||||
var_s0->height, var_s0->dX + arg2, var_s0->dY + arg3,
|
||||
(u8*) sMenuTextureList[var_t0], var_s0->width, var_s0->height);
|
||||
(u8*) var_s0->textureData, var_s0->width, var_s0->height);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user