AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-10 07:49:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Makefile compiled builds have the icon now

Browse Source 
Also fix flatpak .xml file, inventory shouldn't be closed when B is pressed in classic mode
This commit is contained in:
UnknownShadow200 2024-04-07 16:57:06 +10:00
parent b27f86384f
commit bde97e4076
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -33,6 +33,7 @@ LIBS = -mwindows -lwinmm -limagehlp
endif endif
ifeq ($(PLAT),linux) ifeq ($(PLAT),linux)
CFLAGS = -g -pipe -fno-math-errno -DCC_BUILD_ICON
LIBS = -lX11 -lXi -lpthread -lGL -ldl LIBS = -lX11 -lXi -lpthread -lGL -ldl
endif endif
@ -43,31 +44,31 @@ endif
ifeq ($(PLAT),darwin) ifeq ($(PLAT),darwin)
OBJECTS += $(BUILD_DIR)/interop_cocoa.o OBJECTS += $(BUILD_DIR)/interop_cocoa.o
CFLAGS = -g -pipe -fno-math-errno CFLAGS = -g -pipe -fno-math-errno -DCC_BUILD_ICON
LIBS = LIBS =
LDFLAGS = -rdynamic -framework Cocoa -framework OpenGL -framework IOKit -lobjc LDFLAGS = -rdynamic -framework Cocoa -framework OpenGL -framework IOKit -lobjc
endif endif
ifeq ($(PLAT),freebsd) ifeq ($(PLAT),freebsd)
CFLAGS = -g -pipe -I /usr/local/include -fno-math-errno CFLAGS = -g -pipe -I /usr/local/include -fno-math-errno -DCC_BUILD_ICON
LDFLAGS = -L /usr/local/lib -rdynamic LDFLAGS = -L /usr/local/lib -rdynamic
LIBS = -lexecinfo -lGL -lX11 -lXi -lpthread LIBS = -lexecinfo -lGL -lX11 -lXi -lpthread
endif endif
ifeq ($(PLAT),openbsd) ifeq ($(PLAT),openbsd)
CFLAGS = -g -pipe -I /usr/X11R6/include -I /usr/local/include -fno-math-errno CFLAGS = -g -pipe -I /usr/X11R6/include -I /usr/local/include -fno-math-errno -DCC_BUILD_ICON
LDFLAGS = -L /usr/X11R6/lib -L /usr/local/lib -rdynamic LDFLAGS = -L /usr/X11R6/lib -L /usr/local/lib -rdynamic
LIBS = -lexecinfo -lGL -lX11 -lXi -lpthread LIBS = -lexecinfo -lGL -lX11 -lXi -lpthread
endif endif
ifeq ($(PLAT),netbsd) ifeq ($(PLAT),netbsd)
CFLAGS = -g -pipe -I /usr/X11R7/include -I /usr/pkg/include -fno-math-errno CFLAGS = -g -pipe -I /usr/X11R7/include -I /usr/pkg/include -fno-math-errno -DCC_BUILD_ICON
LDFLAGS = -L /usr/X11R7/lib -L /usr/pkg/lib -rdynamic LDFLAGS = -L /usr/X11R7/lib -L /usr/pkg/lib -rdynamic
LIBS = -lexecinfo -lGL -lX11 -lXi -lpthread LIBS = -lexecinfo -lGL -lX11 -lXi -lpthread
endif endif
ifeq ($(PLAT),dragonfly) ifeq ($(PLAT),dragonfly)
CFLAGS = -g -pipe -I /usr/local/include -fno-math-errno CFLAGS = -g -pipe -I /usr/local/include -fno-math-errno -DCC_BUILD_ICON
LDFLAGS = -L /usr/local/lib -rdynamic LDFLAGS = -L /usr/local/lib -rdynamic
LIBS = -lexecinfo -lGL -lX11 -lXi -lpthread LIBS = -lexecinfo -lGL -lX11 -lXi -lpthread
endif endif

1
misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml
View File

@ -108,7 +108,6 @@
<release version="1.1.1" date="2019-12-16" type="stable"> <release version="1.1.1" date="2019-12-16" type="stable">
<url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.1</url> <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.1</url>
</release> </release>
</release>
</releases> </releases>
<url type="homepage">https://www.classicube.net/</url> <url type="homepage">https://www.classicube.net/</url>
<url type="bugtracker">https://github.com/ClassiCube/ClassiCube/issues</url> <url type="bugtracker">https://github.com/ClassiCube/ClassiCube/issues</url>

5
src/Screens.c
View File

@ -1644,7 +1644,7 @@ static void InventoryScreen_MoveToSelected(struct InventoryScreen* s) {
s->deferredSelect = false; s->deferredSelect = false;
if (Game_ClassicMode) { if (Game_ClassicMode) {
/* Original classic preserves selected block across inventory menu opens */ /* Accuracy: Original classic preserves selected block across inventory menu opens */
TableWidget_SetToIndex(table, table->selectedIndex); TableWidget_SetToIndex(table, table->selectedIndex);
} else { } else {
TableWidget_SetToBlock(table, Inventory_SelectedBlock); TableWidget_SetToBlock(table, Inventory_SelectedBlock);
@ -1709,7 +1709,8 @@ static int InventoryScreen_KeyDown(void* screen, int key) {
struct InventoryScreen* s = (struct InventoryScreen*)screen; struct InventoryScreen* s = (struct InventoryScreen*)screen;
struct TableWidget* table = &s->table; struct TableWidget* table = &s->table;
if (KeyBind_Claims(KEYBIND_INVENTORY, key) && s->releasedInv) { /* Accuracy: Original classic doesn't close inventory menu when B is pressed */
if (KeyBind_Claims(KEYBIND_INVENTORY, key) && s->releasedInv && !Game_ClassicMode) {
Gui_Remove((struct Screen*)s); Gui_Remove((struct Screen*)s);
} else if (Input_IsEnterButton(key) && table->selectedIndex != -1) { } else if (Input_IsEnterButton(key) && table->selectedIndex != -1) {
Inventory_SetSelectedBlock(table->blocks[table->selectedIndex]); Inventory_SetSelectedBlock(table->blocks[table->selectedIndex]);