Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit74cc11e

Browse files
committed
refactor!: Fix stuff for latest MK7-Memory changes
1 parent2339af1 commit74cc11e

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,19 @@ export LIBPATHS:=$(foreach dir,$(LIBDIRS),-L $(dir)/lib)
160160
#---------------------------------------------------------------------------------
161161
all: release debug
162162

163-
release: release_dir
163+
release:produce_includesrelease_dir
164164
@$(MAKE) BUILD=release OUTPUT=$(CURDIR)/$(TARGET)-release.3gx BUILD_LIBS="-lctrpf -lctru" WL=--strip-discarded,--strip-debug,\
165165
DEPSDIR=$(CURDIR)/release\
166166
--no-print-directory --jobs=$(shell nproc) -C release -f$(CURDIR)/Makefile
167167

168-
debug: debug_dir
168+
debug:produce_includesdebug_dir
169169
@$(MAKE) BUILD=debug OUTPUT=$(CURDIR)/$(TARGET)-debug.3gx BUILD_LIBS="-lctrpfd -lctrud"\
170170
DEPSDIR=$(CURDIR)/debug BUILD_CFLAGS="-D_DEBUG"\
171171
--no-print-directory --jobs=$(shell nproc) -C debug -f$(CURDIR)/Makefile
172172

173+
produce_includes:
174+
@$(MAKE) --no-print-directory -C vendor/mk7-memory
175+
173176
release_dir:
174177
@[-d release ]|| mkdir -p release
175178

‎src/base/features/item/item_rapidfire.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ namespace base
7474

7575
boolfeatures::item::item_rapidfire::stock(Item::ItemSlot *_this)
7676
{
77-
return g_menu->m_item_rapidfire_entry->IsActivated() && _this->m_info_proxy->isMaster() && !_this->m_info_proxy->isNetRecv() && _this->m_state_observer.m_status_current == Item::ItemSlot::ObserverStatus_Stock;
77+
return g_menu->m_item_rapidfire_entry->IsActivated() && _this->m_info_proxy->isMaster() && !_this->m_info_proxy->isNetRecv() && _this->m_state_observer.m_state_current == Item::ItemSlot::ObserverStatus_Stock;
7878
}
7979
}

‎vendor/mk7-memory‎

Submodulemk7-memory updated201 files

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp