661e32fdf3
- added "musicinfo.conf" for menu and level music configuration - added "editorsetup.conf" for editor element list configuration - added "copy" and "exchange" functions for custom elements to editor - added configurable "bored" and "sleeping" animations for the player - added "awakening" sound for player when waking up after sleeping - added configurable element animations for info screen - added configurable music credits for info screen - added configurable level set information for info screen - added warnings for undefined token values in artwork config files - menu entries now also selectable by clicking on entry text - better sniksnak turning movement (two steps instead of only one) - fixed turning movement of butterflies and fireflies (no frame reset) - fixed bug with wrong default impact sound for colored emeralds - fixed bug with double nut cracking sound - fixed a very nasty bug in dragon turning code in TurnRoundExt() - finally fixed tape recording when player is created from CE change - added new contributed levels
22 lines
827 B
Text
22 lines
827 B
Text
$NetBSD: patch-ak,v 1.3 2003/12/15 14:47:37 adam Exp $
|
|
|
|
--- src/libgame/system.c.orig 2003-12-13 23:30:41.000000000 +0000
|
|
+++ src/libgame/system.c
|
|
@@ -1162,10 +1162,14 @@ inline void InitJoysticks()
|
|
return; /* joysticks generally deactivated by compile-time directive */
|
|
#endif
|
|
|
|
+ /* pkgsrc: InitJoystick will be called more than once, so reset
|
|
+ * the state variable 'joystick' only if there's no joystick available (yet)
|
|
+ */
|
|
/* always start with reliable default values */
|
|
- joystick.status = JOYSTICK_NOT_AVAILABLE;
|
|
- for (i = 0; i < MAX_PLAYERS; i++)
|
|
- joystick.fd[i] = -1; /* joystick device closed */
|
|
+ if (joystick.status == JOYSTICK_NOT_AVAILABLE) {
|
|
+ for (i=0; i<MAX_PLAYERS; i++)
|
|
+ joystick.fd[i] = -1; /* joystick device closed */
|
|
+ }
|
|
|
|
#if defined(TARGET_SDL)
|
|
SDLInitJoysticks();
|