projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030128-1-src
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 468da146ad5f9e4bcba47106b2cbc24b6765c4c5..332dcca21ea8adcc1dacc6a92a2b4fd69976a7cd 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-1,7
+1,7
@@
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-200
1
Artsoft Entertainment *
+* (c) 1995-200
2
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-126,7
+126,11
@@
void HandleOtherEvents(Event *event)
break;
case EVENT_UNMAPNOTIFY:
break;
case EVENT_UNMAPNOTIFY:
+#if 0
+ /* This causes the game to stop not only when iconified, but also
+ when on another virtual desktop, which might be not desired. */
SleepWhileUnmapped();
SleepWhileUnmapped();
+#endif
break;
case EVENT_FOCUSIN:
break;
case EVENT_FOCUSIN:
@@
-444,7
+448,7
@@
void HandleKey(Key key, int key_status)
if (tape.single_step && clear_button_2[pnr])
{
if (tape.single_step && clear_button_2[pnr])
{
- stored_player[pnr].action &= ~
MV
_BUTTON_2;
+ stored_player[pnr].action &= ~
KEY
_BUTTON_2;
clear_button_2[pnr] = FALSE;
}
clear_button_2[pnr] = FALSE;
}
@@
-456,31
+460,31
@@
void HandleKey(Key key, int key_status)
if (tape.single_step && tape.recording && tape.pausing)
{
if (key_status == KEY_PRESSED &&
if (tape.single_step && tape.recording && tape.pausing)
{
if (key_status == KEY_PRESSED &&
- (key_action & (
MV_MOTION | MV
_BUTTON_1)))
+ (key_action & (
KEY_MOTION | KEY
_BUTTON_1)))
{
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
{
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
- if (key_action &
MV
_MOTION)
+ if (key_action &
KEY
_MOTION)
{
{
- if (stored_player[pnr].action &
MV
_BUTTON_2)
+ if (stored_player[pnr].action &
KEY
_BUTTON_2)
bomb_placed[pnr] = TRUE;
}
}
else if (key_status == KEY_RELEASED &&
bomb_placed[pnr] = TRUE;
}
}
else if (key_status == KEY_RELEASED &&
- (key_action &
MV
_BUTTON_2))
+ (key_action &
KEY
_BUTTON_2))
{
if (!bomb_placed[pnr])
{
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
{
if (!bomb_placed[pnr])
{
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
- stored_player[pnr].action |=
MV
_BUTTON_2;
+ stored_player[pnr].action |=
KEY
_BUTTON_2;
clear_button_2[pnr] = TRUE;
}
bomb_placed[pnr] = FALSE;
}
}
clear_button_2[pnr] = TRUE;
}
bomb_placed[pnr] = FALSE;
}
}
- else if (tape.recording && tape.pausing)
+ else if (tape.recording && tape.pausing
&& (key_action & KEY_ACTION)
)
TapeTogglePause(TAPE_TOGGLE_MANUAL);
}
}
TapeTogglePause(TAPE_TOGGLE_MANUAL);
}
}
@@
-509,7
+513,7
@@
void HandleKey(Key key, int key_status)
if (key_status == KEY_RELEASED)
return;
if (key_status == KEY_RELEASED)
return;
- if ((key == KSYM_Return || key ==
KSYM_spac
e) &&
+ if ((key == KSYM_Return || key ==
setup.shortcut.toggle_paus
e) &&
game_status == PLAYING && AllPlayersGone)
{
CloseDoor(DOOR_CLOSE_1);
game_status == PLAYING && AllPlayersGone)
{
CloseDoor(DOOR_CLOSE_1);
@@
-531,23
+535,25
@@
void HandleKey(Key key, int key_status)
return;
}
return;
}
- /* special
shortcuts for quick game tape saving and loading
*/
+ /* special
key shortcuts
*/
if (game_status == MAINMENU || game_status == PLAYING)
{
if (key == setup.shortcut.save_game)
TapeQuickSave();
else if (key == setup.shortcut.load_game)
TapeQuickLoad();
if (game_status == MAINMENU || game_status == PLAYING)
{
if (key == setup.shortcut.save_game)
TapeQuickSave();
else if (key == setup.shortcut.load_game)
TapeQuickLoad();
+ else if (key == setup.shortcut.toggle_pause)
+ TapeTogglePause(TAPE_TOGGLE_MANUAL);
}
}
-
+#if 0
#ifndef DEBUG
if (game_status == PLAYING && (tape.playing || tape.pausing))
return;
#endif
#ifndef DEBUG
if (game_status == PLAYING && (tape.playing || tape.pausing))
return;
#endif
-
+#endif
HandleGadgetsKeyInput(key);
HandleGadgetsKeyInput(key);
@@
-564,7
+570,6
@@
void HandleKey(Key key, int key_status)
switch(key)
{
case KSYM_Return:
switch(key)
{
case KSYM_Return:
- case KSYM_space:
if (game_status == MAINMENU)
HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
else if (game_status == CHOOSELEVEL)
if (game_status == MAINMENU)
HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
else if (game_status == CHOOSELEVEL)
@@
-583,11
+588,15
@@
void HandleKey(Key key, int key_status)
case KSYM_Page_Up:
if (game_status == CHOOSELEVEL)
HandleChooseLevel(0,0, 0,-SCR_FIELDY, MB_MENU_MARK);
case KSYM_Page_Up:
if (game_status == CHOOSELEVEL)
HandleChooseLevel(0,0, 0,-SCR_FIELDY, MB_MENU_MARK);
+ else if (game_status == SETUP)
+ HandleSetupScreen(0,0, 0,-SCR_FIELDY, MB_MENU_MARK);
break;
case KSYM_Page_Down:
if (game_status == CHOOSELEVEL)
HandleChooseLevel(0,0, 0,SCR_FIELDY, MB_MENU_MARK);
break;
case KSYM_Page_Down:
if (game_status == CHOOSELEVEL)
HandleChooseLevel(0,0, 0,SCR_FIELDY, MB_MENU_MARK);
+ else if (game_status == SETUP)
+ HandleSetupScreen(0,0, 0,SCR_FIELDY, MB_MENU_MARK);
break;
#ifdef DEBUG
break;
#ifdef DEBUG
@@
-609,7
+618,6
@@
void HandleKey(Key key, int key_status)
switch(key)
{
case KSYM_Return:
switch(key)
{
case KSYM_Return:
- case KSYM_space:
game_status = MAINMENU;
DrawMainMenu();
BackToFront();
game_status = MAINMENU;
DrawMainMenu();
BackToFront();
@@
-850,11
+858,11
@@
void HandleJoystick()
!DelayReached(&joystickmove_delay, GADGET_FRAME_DELAY))
newbutton = dx = dy = 0;
!DelayReached(&joystickmove_delay, GADGET_FRAME_DELAY))
newbutton = dx = dy = 0;
- if (game_status
==
MAINMENU)
+ if (game_status
==
MAINMENU)
HandleMainMenu(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
HandleMainMenu(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
- else if (game_status
==
CHOOSELEVEL)
+ else if (game_status
==
CHOOSELEVEL)
HandleChooseLevel(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
HandleChooseLevel(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
- else if (game_status
==
SETUP)
+ else if (game_status
==
SETUP)
HandleSetupScreen(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
break;
}
HandleSetupScreen(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
break;
}
@@
-867,6
+875,10
@@
void HandleJoystick()
HandleHelpScreen(!newbutton);
break;
HandleHelpScreen(!newbutton);
break;
+ case LEVELED:
+ HandleLevelEditorIdle();
+ break;
+
case PLAYING:
if (tape.playing || keyboard)
newbutton = ((joy & JOY_BUTTON) != 0);
case PLAYING:
if (tape.playing || keyboard)
newbutton = ((joy & JOY_BUTTON) != 0);