voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into add-tests

Browse source
This commit is contained in:
MihailRis 2024-08-12 02:34:07 +03:00
commit e48452cb1a
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/macos.yml vendored
View file

@ -2,7 +2,7 @@ name: Macos Build
on:
push:
branches: [ "main" ]
branches: [ "main", "release-**"]
pull_request:
branches: [ "main" ]

5
src/graphics/core/Font.cpp
View file

@ -83,7 +83,10 @@ void Font::draw(Batch2D* batch, std::wstring_view text, int x, int y, FontStyle
}
uint charpage = c >> 8;
if (charpage == page){
Texture* texture = pages[charpage].get();
Texture* texture = nullptr;
if (charpage < pages.size()) {
texture = pages[charpage].get();
}
if (texture == nullptr){
texture = pages[0].get();
}

2
src/logic/scripting/lua/libblock.cpp
View file

@ -385,7 +385,7 @@ static int l_raycast(lua::State* L) {
}
static int l_compose_state(lua::State* L) {
if (lua::istable(L, 1) || lua::objlen(L, 1) < 3) {
if (!lua::istable(L, 1) || lua::objlen(L, 1) < 3) {
throw std::runtime_error("expected array of 3 integers");
}
blockstate state {};