Move some sounds into the UI subdirectory where they belong.
This commit is contained in:
parent
04c3ea7103
commit
c802d749f3
5 changed files with 13 additions and 13 deletions
|
@ -5,11 +5,11 @@ TOPDIR = ../..
|
|||
# References to terrain graphics go through so many layers of nasty
|
||||
# opaque macros that trying to reference-check them is hopeless.
|
||||
# So suppress reporting them unused even if they seem to have
|
||||
# no references. Also, ignore graphics resources used only by the
|
||||
# GUI code in C++.
|
||||
FAKE = --force-used "(terrain|buttons|cursors||cursors-bw|menu|icons)/"
|
||||
# Suppress meaningless errors about castle graphics.
|
||||
EXCLUDE = --exclude exploder
|
||||
# no references.
|
||||
FAKE = --force-used "(terrain|buttons|cursors|cursors-bw|menu|icons)/"
|
||||
# Suppress meaningless errors about castle graphics and about resources
|
||||
# used only by the GUI code in C++
|
||||
EXCLUDE = --exclude "(exploder|castle-cutter|UI)"
|
||||
|
||||
unresolved:
|
||||
@echo "# Report on unresolved macro calls and resource references"
|
||||
|
@ -17,18 +17,18 @@ unresolved:
|
|||
|
||||
all:
|
||||
@echo "# Report on usage of all macros and resources"
|
||||
@macroscope --crossreference $(TOPDIR)
|
||||
@macroscope --crossreference $(EXCLUDE) $(TOPDIR)
|
||||
|
||||
utils-unused:
|
||||
@echo "# Report on unused utility macros"
|
||||
@macroscope --crossreference --from data/utils --refcount 0 $(FAKE) $(TOPDIR)
|
||||
@macroscope --crossreference --from data/utils --refcount 0 $(FAKE) $(EXCLUDE) $(TOPDIR)
|
||||
|
||||
all-unused:
|
||||
@echo "# Report on unused resource files"
|
||||
@macroscope --crossreference --refcount 0 $(FAKE) $(TOPDIR)
|
||||
@macroscope --crossreference --refcount 0 $(FAKE) $(EXCLUDE) $(TOPDIR)
|
||||
|
||||
utils-macros:
|
||||
@echo "# Report on usage of utility macros"
|
||||
@macroscope --crossreference --from data/utils $(TOPDIR)
|
||||
@macroscope --crossreference --from data/utils $(EXCLUDE) $(TOPDIR)
|
||||
|
||||
|
||||
|
|
|
@ -70,10 +70,10 @@ namespace game_config
|
|||
std::map<std::string, std::vector<Uint32> > team_rgb_colors;
|
||||
|
||||
namespace sounds {
|
||||
const std::string turn_bell = "bell.wav",
|
||||
receive_message = "receive.wav",
|
||||
user_arrive = "arrive.wav",
|
||||
user_leave = "leave.wav";
|
||||
const std::string turn_bell = "UI/bell.wav",
|
||||
receive_message = "UI/receive.wav",
|
||||
user_arrive = "UI/arrive.wav",
|
||||
user_leave = "UI/leave.wav";
|
||||
|
||||
const std::string button_press = "UI/button.wav",
|
||||
checkbox_release = "UI/checkbox.wav",
|
||||
|
|
Loading…
Add table
Reference in a new issue