Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable

This commit is contained in:
MysterD 2022-03-31 00:13:10 -07:00
parent 03f852881d be4919ce24
commit 7aab487adb
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -58,6 +58,9 @@ DISCORD_SDK ?= 1
# Enable docker build workarounds # Enable docker build workarounds
DOCKERBUILD ?= 0 DOCKERBUILD ?= 0
# Should It compile with windows Icon
ICON ?= 1
# Various workarounds for weird toolchains # Various workarounds for weird toolchains
NO_BZERO_BCOPY ?= 0 NO_BZERO_BCOPY ?= 0
@ -829,6 +832,20 @@ else
# endif # endif
endif endif
#icon
ifeq ($(WINDOWS_BUILD),1)
ifeq ($(ICON),1)
Command := mkdir $(BUILD_DIR)/res
Reponce := $(shell $(call Command))
Command := windres -o $(BUILD_DIR)/res/icon.o -i res/icon.rc
Reponce := $(shell $(call Command))
LDFLAGS += $(BUILD_DIR)/res/icon.o
endif
endif
# Coop specific libraries # Coop specific libraries
# Lua # Lua

BIN
res/icon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 401 KiB

1
res/icon.rc Normal file
View File

@ -0,0 +1 @@
id ICON res/icon.ico

6
src/game/mario.c
View File

@ -1529,6 +1529,12 @@ void update_mario_inputs(struct MarioState *m) {
#endif #endif
/* End of developer stuff */ /* End of developer stuff */
if ((m->action == ACT_END_PEACH_CUTSCENE || m->action == ACT_CREDITS_CUTSCENE) && m->controller->buttonPressed & START_BUTTON) {
gCurrActStarNum = 0;
gCurrActNum = 0;
gChangeLevel = 16;
}
if (m->playerIndex == 0) { if (m->playerIndex == 0) {
if (!localIsPaused && gCameraMovementFlags & CAM_MOVE_C_UP_MODE) { if (!localIsPaused && gCameraMovementFlags & CAM_MOVE_C_UP_MODE) {
if (m->action & ACT_FLAG_ALLOW_FIRST_PERSON) { if (m->action & ACT_FLAG_ALLOW_FIRST_PERSON) {