Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' into mips64

Browse source
This commit is contained in:
smallmodel 2025-03-19 15:03:09 +01:00 • committed by GitHub
commit 6deab853b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/fgame/actor.cpp
View file

@ -432,7 +432,7 @@ Event EV_Actor_SetAnimFinal
EV_DEFAULT,
NULL,
NULL,
"Whether the animation was succesfully finished",
"Whether the animation was successfully finished",
EV_SETTER
);
Event EV_Actor_GetWeaponType

2
code/fgame/trigger.cpp
View file

@ -77,7 +77,7 @@ Event EV_Trigger_SetCount
EV_DEFAULT,
"i",
"count",
"Set the amount of times this trigger can be triggered",
"Set the number of times this trigger can be triggered",
EV_NORMAL
);
Event EV_Trigger_SetMessage

2
code/qcommon/listener.cpp
View file

@ -669,7 +669,7 @@ void EventArgDef::Setup(const char *eventName, const char *argName, const char *
if (!endptr) {
assert(0);
EVENT_Printf(
"Argument defintion %s, no matching ']' found for range spec in event %s.\n",
"Argument definition %s, no matching ']' found for range spec in event %s.\n",
name.c_str(),
eventName
);

1
code/renderercommon/CMakeLists.txt
View file

@ -25,6 +25,7 @@ if(USE_INTERNAL_JPEG)
target_link_libraries(omohrenderer_common PRIVATE jpeg8)
target_compile_definitions(omohrenderer_common PUBLIC USE_INTERNAL_JPEG)
else()
find_package(JPEG REQUIRED)
target_include_directories(omohrenderer_common PUBLIC ${JPEG_INCLUDE_DIRS})
target_link_libraries(omohrenderer_common PRIVATE ${JPEG_LIBRARIES})
endif()