projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060219-1-src
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index d7d023e72c2343c953cbad089cf8049e3cb3b050..f9627a15be4f54d2a5f5524fe998d68c4874aa2a 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-435,6
+435,7
@@
void HandleButton(int mx, int my, int button)
break;
case GAME_MODE_EDITOR:
break;
case GAME_MODE_EDITOR:
+ HandleLevelEditorIdle();
break;
case GAME_MODE_INFO:
break;
case GAME_MODE_INFO:
@@
-565,7
+566,6
@@
static void HandleKeysSpecial(Key key)
void HandleKey(Key key, int key_status)
{
void HandleKey(Key key, int key_status)
{
- int joy = 0;
boolean anyTextGadgetActiveOrJustFinished = anyTextGadgetActive();
static struct SetupKeyboardInfo custom_key;
static struct
boolean anyTextGadgetActiveOrJustFinished = anyTextGadgetActive();
static struct SetupKeyboardInfo custom_key;
static struct
@@
-582,6
+582,8
@@
void HandleKey(Key key, int key_status)
{ &custom_key.snap, DEFAULT_KEY_SNAP, JOY_BUTTON_1 },
{ &custom_key.drop, DEFAULT_KEY_DROP, JOY_BUTTON_2 }
};
{ &custom_key.snap, DEFAULT_KEY_SNAP, JOY_BUTTON_1 },
{ &custom_key.drop, DEFAULT_KEY_DROP, JOY_BUTTON_2 }
};
+ int joy = 0;
+ int i;
if (game_status == GAME_MODE_PLAYING)
{
if (game_status == GAME_MODE_PLAYING)
{
@@
-592,7
+594,6
@@
void HandleKey(Key key, int key_status)
for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
{
for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
{
- int i;
byte key_action = 0;
if (setup.input[pnr].use_joystick)
byte key_action = 0;
if (setup.input[pnr].use_joystick)
@@
-648,8
+649,6
@@
void HandleKey(Key key, int key_status)
}
else
{
}
else
{
- int i;
-
for (i = 0; i < 6; i++)
if (key == key_info[i].key_default)
joy |= key_info[i].action;
for (i = 0; i < 6; i++)
if (key == key_info[i].key_default)
joy |= key_info[i].action;
@@
-681,7
+680,8
@@
void HandleKey(Key key, int key_status)
return;
}
return;
}
- if (game_status == GAME_MODE_MAIN && key == setup.shortcut.toggle_pause)
+ if (game_status == GAME_MODE_MAIN &&
+ (key == setup.shortcut.toggle_pause || key == KSYM_space))
{
StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE);
{
StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE);
@@
-698,6
+698,13
@@
void HandleKey(Key key, int key_status)
TapeTogglePause(TAPE_TOGGLE_MANUAL);
}
TapeTogglePause(TAPE_TOGGLE_MANUAL);
}
+ if (game_status == GAME_MODE_PLAYING)
+ {
+ for (i = 0; i < MAX_PLAYERS; i++)
+ if (key == KSYM_1 + i)
+ game.centered_to_player_next = i;
+ }
+
HandleKeysSpecial(key);
if (HandleGadgetsKeyInput(key))
HandleKeysSpecial(key);
if (HandleGadgetsKeyInput(key))
@@
-718,7
+725,12
@@
void HandleKey(Key key, int key_status)
case GAME_MODE_INFO:
switch(key)
{
case GAME_MODE_INFO:
switch(key)
{
+#if 1
case KSYM_space:
case KSYM_space:
+#else
+ /* !!! only use "space" key to start game from main menu !!! */
+ case KSYM_space:
+#endif
case KSYM_Return:
if (game_status == GAME_MODE_MAIN)
HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
case KSYM_Return:
if (game_status == GAME_MODE_MAIN)
HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
@@
-757,6
+769,12
@@
void HandleKey(Key key, int key_status)
HandleInfoScreen(0,0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK);
break;
HandleInfoScreen(0,0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK);
break;
+#ifdef DEBUG
+ case KSYM_0:
+ GameFrameDelay = (GameFrameDelay == 500 ? GAME_FRAME_DELAY : 500);
+ break;
+#endif
+
default:
break;
}
default:
break;
}
@@
-800,6
+818,7
@@
void HandleKey(Key key, int key_status)
#ifdef DEBUG
case KSYM_0:
#ifdef DEBUG
case KSYM_0:
+#if 0
case KSYM_1:
case KSYM_2:
case KSYM_3:
case KSYM_1:
case KSYM_2:
case KSYM_3:
@@
-809,6
+828,7
@@
void HandleKey(Key key, int key_status)
case KSYM_7:
case KSYM_8:
case KSYM_9:
case KSYM_7:
case KSYM_8:
case KSYM_9:
+#endif
if (key == KSYM_0)
{
if (GameFrameDelay == 500)
if (key == KSYM_0)
{
if (GameFrameDelay == 500)