Skip to content

Commit

Permalink
fix crash
Browse files Browse the repository at this point in the history
  • Loading branch information
HJfod committed Feb 18, 2024
1 parent 88b857f commit a8850eb
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,11 @@ endif()
if(MSVC)
target_compile_options(${PROJECT_NAME} PRIVATE /W4)
else()
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic -Wno-dollar-in-identifier-extension)
target_compile_options(${PROJECT_NAME} PRIVATE
-Wall -Wextra -Wpedantic
# $override, $modify, etc. should be allowed
-Wno-dollar-in-identifier-extension
# Class init functions all overload a virtual
-Wno-overloaded-virtual
)
endif()
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

## v6.3.1

* Fix crash when placing objects, as well as grid size not working

## v6.3.0

* Add Next Free Offset for Group IDs
Expand Down
2 changes: 1 addition & 1 deletion mod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"geode": "2.0.0-beta.20",
"version": "v6.3.0",
"version": "v6.3.1",
"gd": {
"win": "2.204",
"mac": "2.200",
Expand Down
7 changes: 7 additions & 0 deletions src/features/GridScaling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@ class $modify(ObjectToolbox) {
float gridNodeSizeForKey(int id) {
auto size = Mod::get()->template getSavedValue<float>("grid-size");
if (size < 1 || roundf(size) == 30) {
#ifdef GEODE_IS_WINDOWS
ObjectToolbox::gridNodeSizeForKey(id);
float real;
__asm movss real, xmm0
return real;
#else
return ObjectToolbox::gridNodeSizeForKey(id);
#endif
}
return size;
}
Expand Down

0 comments on commit a8850eb

Please sign in to comment.