• R/O
  • SSH

hyakutyping: コミット

ゲーム用のソースコード


コミットメタ情報

リビジョン84c4d5adb8f2b26a869158475a363ae26608a02d (tree)
日時2011-07-29 18:45:20
作者satofumi
コミッターsatofumi

ログメッセージ

Ctrl-f,b,n,p の操作を Option でも使えるようにした

変更サマリ

差分

diff -r 057a19528048 -r 84c4d5adb8f2 Option.cpp
--- a/Option.cpp Fri Jul 29 18:20:37 2011 +0900
+++ b/Option.cpp Fri Jul 29 18:45:20 2011 +0900
@@ -60,9 +60,20 @@
6060 prev_cursor_(layer_manager_.cursor()), cursor_(prev_cursor_)
6161 {
6262 up_event_.key(SDLK_UP, SDL_KEYDOWN, KMOD_NONE);
63+ up_event_.key(SDLK_p, SDL_KEYDOWN, KMOD_LCTRL);
64+ up_event_.key(SDLK_p, SDL_KEYDOWN, KMOD_RCTRL);
65+
6366 down_event_.key(SDLK_DOWN, SDL_KEYDOWN, KMOD_NONE);
67+ down_event_.key(SDLK_n, SDL_KEYDOWN, KMOD_LCTRL);
68+ down_event_.key(SDLK_n, SDL_KEYDOWN, KMOD_RCTRL);
69+
6470 left_event_.key(SDLK_LEFT, SDL_KEYDOWN, KMOD_NONE);
71+ left_event_.key(SDLK_b, SDL_KEYDOWN, KMOD_LCTRL);
72+ left_event_.key(SDLK_b, SDL_KEYDOWN, KMOD_RCTRL);
73+
6574 right_event_.key(SDLK_RIGHT, SDL_KEYDOWN, KMOD_NONE);
75+ right_event_.key(SDLK_f, SDL_KEYDOWN, KMOD_LCTRL);
76+ right_event_.key(SDLK_f, SDL_KEYDOWN, KMOD_RCTRL);
6677
6778 layer_manager_.insertEvent(&up_event_);
6879 layer_manager_.insertEvent(&down_event_);
@@ -154,6 +165,7 @@
154165 menu->press(clicked_id);
155166 }
156167
168+
157169 void updateSelectedItem(int index, int xx)
158170 {
159171 Menu* menu = components_[index];
diff -r 057a19528048 -r 84c4d5adb8f2 scripts/option_config.lua
--- a/scripts/option_config.lua Fri Jul 29 18:20:37 2011 +0900
+++ b/scripts/option_config.lua Fri Jul 29 18:45:20 2011 +0900
@@ -100,8 +100,7 @@
100100 -- 効果音の音量設定を反映させる
101101 if volume_se_:clickedIndex() ~= volume_se_index_ then
102102 volume_se_index_ = volume_se_:clickedIndex()
103- local sound_effect = SoundEffect("")
104- sound_effect:setMasterVolume(volume_se_index_ * 10)
103+ sound_effect_input_teminated_:setMasterVolume(volume_se_index_ * 10)
105104 end
106105 end
107106
diff -r 057a19528048 -r 84c4d5adb8f2 scripts/startup.lua
--- a/scripts/startup.lua Fri Jul 29 18:20:37 2011 +0900
+++ b/scripts/startup.lua Fri Jul 29 18:45:20 2011 +0900
@@ -154,8 +154,7 @@
154154
155155 -- 音量設定を反映
156156 back_music_:setVolume(volume_music_index_ * 10)
157- local sound_effect = SoundEffect("")
158- sound_effect:setMasterVolume(volume_se_index_ * 10)
157+ sound_effect_input_teminated_:setMasterVolume(volume_se_index_ * 10)
159158
160159 -- 共通リソースの初期化
161160 layer_manager_ = LayerManager()
旧リポジトリブラウザで表示