Merge branch 'main' into add-tests
This commit is contained in:
commit
e48452cb1a
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -2,7 +2,7 @@ name: Macos Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
branches: [ "main", "release-**"]
|
||||
pull_request:
|
||||
branches: [ "main" ]
|
||||
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
@ -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 {};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user