head	1.9;
access;
symbols
	pkgsrc-2017Q2:1.8.0.68
	pkgsrc-2017Q2-base:1.8
	pkgsrc-2017Q1:1.8.0.66
	pkgsrc-2017Q1-base:1.8
	pkgsrc-2016Q4:1.8.0.64
	pkgsrc-2016Q4-base:1.8
	pkgsrc-2016Q3:1.8.0.62
	pkgsrc-2016Q3-base:1.8
	pkgsrc-2016Q2:1.8.0.60
	pkgsrc-2016Q2-base:1.8
	pkgsrc-2016Q1:1.8.0.58
	pkgsrc-2016Q1-base:1.8
	pkgsrc-2015Q4:1.8.0.56
	pkgsrc-2015Q4-base:1.8
	pkgsrc-2015Q3:1.8.0.54
	pkgsrc-2015Q3-base:1.8
	pkgsrc-2015Q2:1.8.0.52
	pkgsrc-2015Q2-base:1.8
	pkgsrc-2015Q1:1.8.0.50
	pkgsrc-2015Q1-base:1.8
	pkgsrc-2014Q4:1.8.0.48
	pkgsrc-2014Q4-base:1.8
	pkgsrc-2014Q3:1.8.0.46
	pkgsrc-2014Q3-base:1.8
	pkgsrc-2014Q2:1.8.0.44
	pkgsrc-2014Q2-base:1.8
	pkgsrc-2014Q1:1.8.0.42
	pkgsrc-2014Q1-base:1.8
	pkgsrc-2013Q4:1.8.0.40
	pkgsrc-2013Q4-base:1.8
	pkgsrc-2013Q3:1.8.0.38
	pkgsrc-2013Q3-base:1.8
	pkgsrc-2013Q2:1.8.0.36
	pkgsrc-2013Q2-base:1.8
	pkgsrc-2013Q1:1.8.0.34
	pkgsrc-2013Q1-base:1.8
	pkgsrc-2012Q4:1.8.0.32
	pkgsrc-2012Q4-base:1.8
	pkgsrc-2012Q3:1.8.0.30
	pkgsrc-2012Q3-base:1.8
	pkgsrc-2012Q2:1.8.0.28
	pkgsrc-2012Q2-base:1.8
	pkgsrc-2012Q1:1.8.0.26
	pkgsrc-2012Q1-base:1.8
	pkgsrc-2011Q4:1.8.0.24
	pkgsrc-2011Q4-base:1.8
	pkgsrc-2011Q3:1.8.0.22
	pkgsrc-2011Q3-base:1.8
	pkgsrc-2011Q2:1.8.0.20
	pkgsrc-2011Q2-base:1.8
	pkgsrc-2011Q1:1.8.0.18
	pkgsrc-2011Q1-base:1.8
	pkgsrc-2010Q4:1.8.0.16
	pkgsrc-2010Q4-base:1.8
	pkgsrc-2010Q3:1.8.0.14
	pkgsrc-2010Q3-base:1.8
	pkgsrc-2010Q2:1.8.0.12
	pkgsrc-2010Q2-base:1.8
	pkgsrc-2010Q1:1.8.0.10
	pkgsrc-2010Q1-base:1.8
	pkgsrc-2009Q4:1.8.0.8
	pkgsrc-2009Q4-base:1.8
	pkgsrc-2009Q3:1.8.0.6
	pkgsrc-2009Q3-base:1.8
	pkgsrc-2009Q2:1.8.0.4
	pkgsrc-2009Q2-base:1.8
	pkgsrc-2009Q1:1.8.0.2
	pkgsrc-2009Q1-base:1.8
	pkgsrc-2008Q4:1.7.0.14
	pkgsrc-2008Q4-base:1.7
	pkgsrc-2008Q3:1.7.0.12
	pkgsrc-2008Q3-base:1.7
	cube-native-xorg:1.7.0.10
	cube-native-xorg-base:1.7
	pkgsrc-2008Q2:1.7.0.8
	pkgsrc-2008Q2-base:1.7
	cwrapper:1.7.0.6
	pkgsrc-2008Q1:1.7.0.4
	pkgsrc-2008Q1-base:1.7
	pkgsrc-2007Q4:1.7.0.2
	pkgsrc-2007Q4-base:1.7
	pkgsrc-2007Q3:1.6.0.6
	pkgsrc-2007Q3-base:1.6
	pkgsrc-2007Q2:1.6.0.4
	pkgsrc-2007Q2-base:1.6
	pkgsrc-2007Q1:1.6.0.2
	pkgsrc-2007Q1-base:1.6
	pkgsrc-2006Q4:1.5.0.12
	pkgsrc-2006Q4-base:1.5
	pkgsrc-2006Q3:1.5.0.10
	pkgsrc-2006Q3-base:1.5
	pkgsrc-2006Q2:1.5.0.8
	pkgsrc-2006Q2-base:1.5
	pkgsrc-2006Q1:1.5.0.6
	pkgsrc-2006Q1-base:1.5
	pkgsrc-2005Q4:1.5.0.4
	pkgsrc-2005Q4-base:1.5
	pkgsrc-2005Q3:1.5.0.2
	pkgsrc-2005Q3-base:1.5
	pkgsrc-2005Q2:1.4.0.6
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.4
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.4.0.2
	pkgsrc-2004Q4-base:1.4
	pkgsrc-2004Q3:1.3.0.6
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.4
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.2
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6-1:1.1.0.2
	netbsd-1-6-1-base:1.1;
locks; strict;
comment	@# @;


1.9
date	2017.09.09.07.10.34;	author adam;	state dead;
branches;
next	1.8;
commitid	CJ7p87HF1Gf8vu6A;

1.8
date	2009.01.12.19.22.18;	author adam;	state Exp;
branches;
next	1.7;

1.7
date	2007.10.13.12.58.48;	author adam;	state Exp;
branches;
next	1.6;

1.6
date	2007.03.18.18.29.38;	author adam;	state Exp;
branches;
next	1.5;

1.5
date	2005.08.16.15.35.51;	author adam;	state Exp;
branches;
next	1.4;

1.4
date	2004.11.03.15.14.18;	author adam;	state Exp;
branches;
next	1.3;

1.3
date	2003.12.15.14.47.37;	author adam;	state Exp;
branches;
next	1.2;

1.2
date	2003.08.05.15.12.47;	author adam;	state Exp;
branches;
next	1.1;

1.1
date	2002.10.29.19.07.54;	author heinz;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Rocks'n'Diamonds 4.0.0.2:

This release is mainly a bugfix release, but also contains the following changes and additions:
* fixed several bugs and problems with level template handling in the level editor
* fixed several problems with the undo/redo buttons under certain conditions
* fixed various other small and medium bugs (see commit history for details)
* improved menu screens navigation and level selection using the keyboard
* added option to use pre-defined level template for newly created levels
* added level template settings to editor/level configuration screen in editor
* added setup option to show/hide classic elements in the editor palette
* added setup option to enable/disable auto-incrementing solved levels
* added headless mode (no window) for automated tape tests using ‘autotest’
* improved progress and summary output for automatic tape replay / testing
@
text
@$NetBSD: patch-ak,v 1.8 2009/01/12 19:22:18 adam Exp $

--- src/libgame/system.c.orig	2008-01-25 22:25:33.000000000 +0100
+++ src/libgame/system.c
@@@@ -1494,10 +1494,14 @@@@ 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();
@


1.8
log
@Changes 3.2.6.0:
* fixed crash bug when scrolling with cursor keys in editor
* fixed X11 crash bug when scaling images with width/height less than 32
* fixed X11 crash bug when blitting masked title screens over background
* fixed growing steel wall to also leave behind steel wall
* fixed custom element change conditions where a player element is used
* fixed bug with player relocation while the player switches an element
* fixed problems with re-mapping players on playfield to input devices
* fixed wrong behaviour of player option "no centering when relocating"
* added condition "deadly when " for custom elements
* added possibility to reanimate player immediately after his death
* added "element used as action parameter" to element change actions
* added optional initial inventory for players (pre-collected elements)
* added change page actions "set player inventory" and "set CE artwork"
* added switch for EM style dynamite "[ ] explodes with chain reaction"
* moved "level settings" and "editor settings" to two tabbed screens
* added level setting to start a level with always the same random seed
* added CE action "set random seed" to re-initialize random seed in game
@
text
@d1 1
a1 1
$NetBSD$
@


1.7
log
@Changes 3.2.4:
* fixed crash bug in toon drawing functions for large step offset values
* fixed some problems with displaying game panel when quick-loading tape
* fixed (experimental only) redrawing of every tile per frame (even if
  unneeded) for the extended (R'n'D based) EMC graphics engine
* added optimization to only calculate element count for panel display
  if really needed (that is, if element count values defined on panel)
* fixed problem with special editor door redraw when entering main menu
* fixed bug with displaying background for title messages on info screen
* some code cleanup for the extended (R'n'D based) EMC graphics engine
* fixed bug with CE action "move player" always resulting in player 4
  if there was a CE action with no trigger player (because the player
  element was calculated by using log_2() from trigger player bits with
  the value PLAYER_BITS_ANY) -- this is now fixed by also storing the
  triggering player bit mask and handling all players in "move player"
* fixed bug when defined artwork cannot be found for artwork that has
  default artwork cloned from other artwork (without default filename)
* added several fixes to the extended (R'n'D based) EMC graphics engine
* fixed broken editor copy and paste for custom elements between levels
@
text
@d3 1
a3 1
--- src/libgame/system.c.orig	2007-09-03 21:27:29.000000000 +0200
d5 1
a5 1
@@@@ -1457,10 +1457,14 @@@@ void InitJoysticks()
@


1.6
log
@Changes 3.2.3:
* fixed malloc/free bug when updating EMC artwork entries in level list
* added workaround (warning and request to quit the current game) when
  changing elements cause endless recursion loop (which would otherwise
  freeze the game, causing a crash-like program exit on some systems)
* fixed nasty string overflow bug when entering too long envelope text
* added feedback sounds for menu navigation "menu.item.activating" and
  "menu.item.selecting" (for highlighting and executing menu entries)
* improved "no scrolling when relocating" to also consider scroll delay
  (meaning that the player is not automatically centered in this case;
  this makes it possible to "invisibly" relocate the player to a region
  of the level playfield which looks the same as the old level region)
* fixed bug with not recognizing "main.input.name.align" when active
* fixed bug with displaying masked borders over title screens when
  screen fading is disabled
* fixed infinite loop / crash bug when killing the player while having
  a CE with the setting "kill player X when explosion of <player X>"
* added special editor graphic for "char_space" to distinguish it from
  "empty_space" when editing a level (in-game graphics still the same)
* fixed nasty bug with initialization only done for the first player
* small change to handle loading empty element/content list micro chunks
* uploaded pre-release (test) version 3.2.3-0 binary and source code
* some optimizations on startup speed by reducing initial text output
* added caching of custom artwork information for faster startup times
* fixed graphical bug when using fewer menu entries on level selection
  screen than usual (with "menu.list_size.LEVELS" directive)
* fixed crash bug (Windows/SDL only) caused by BlitBitmap blitting from
  the backbuffer to the backbuffer by error (with identical rectangle)
* fixed bug when displaying titlescreen with size less than element tile
* fixed bug that caused elements with "change when digging <e>" event
  to change for _every_ digged element, not only those specified in <e>
* fixed bug that caused impact style collision when dropping element one
  tile over the player that can both fall down and smash players
* fixed bug that caused impact style collision when element changed to
  falling/smashing element over the player immediately after movement
@
text
@d3 1
a3 1
--- src/libgame/system.c.orig	2006-12-28 01:43:10.000000000 +0100
d5 1
a5 1
@@@@ -1340,10 +1340,14 @@@@ void InitJoysticks()
@


1.5
log
@Changes 3.1.1:
- added tutorial level set created by Aaron Davidson
- added editor element descriptions written by Aaron Davidson
- added native game engine for Emerald Mine (Club) levels
- added level skipping functionality to main menu
- added support for dumping small-sized level sketches from editor
- added use of "editorsetup.conf" for different level sets
- lots of bugfixes and internal engine changes (see ChangeLog)
@
text
@d3 1
a3 1
--- src/libgame/system.c.orig	2005-06-27 20:26:12.000000000 +0000
d5 1
a5 1
@@@@ -1279,10 +1279,14 @@@@ inline void InitJoysticks()
@


1.4
log
@Changes 3.1.0:
- fixed obvious bug with wrong "Murphy" graphics (when digging etc.)
- fixed a lot of Emerald Mine and Supaplex game engine emulation bugs
- re-converted Emerald Mine and Supaplex levels to apply engine fixes
- changed default snap/drop keys from left/right Shift to Control keys
- added level loader for loading native Emerald Mine levels
- added level loader for loading native Supaplex packed levels
- added group elements for multiple matches and random element creation
- added elements that can be digged or left behind by custom elements
- added element "Sokoban field with player" missing for Sokoban levels
- added custom element features to allow building of teleporters
- added option to use step limit instead of time limit for level
- added pressing "space" key as valid action to select menu options
- added clipboard (cut and paste buttons) for custom and group elements
- added shortcut to dump brush (type ":DB" in editor) for use in forum
- added network multiplayer code for Windows (still only command line)
- replaced old tutorial level set with far better one by Niko Böhm
- "contributions" levels now separate package to make base set smaller
- too many bugfixes and changes to list them all here (see ChangeLog)
@
text
@d3 1
a3 1
--- src/libgame/system.c.orig	2004-04-27 23:14:34.000000000 +0000
d5 1
a5 1
@@@@ -1190,10 +1190,14 @@@@ inline void InitJoysticks()
@


1.3
log
@Changes 3.0.8:
- 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
@
text
@d3 1
a3 1
--- src/libgame/system.c.orig	2003-12-13 23:30:41.000000000 +0000
d5 1
a5 1
@@@@ -1162,10 +1162,14 @@@@ inline void InitJoysticks()
@


1.2
log
@Changes 3.0.0 (since 2.1.1):
- final version bumped to 3.0.0 due to the massive changes
- graphics and sounds now completely and dynamically customizable
- element animation length, speed and mode now freely configurable
- 128 custom elements with lots of configurable element properties
- advanced custom element settings for powerful, self-created elements
- automatic tape playing function for game engine and level testing
- added support for stereo WAV sound files
- added support for background images for all menu screens
- added some example levels showing how to create custom artwork
- fixed Supaplex gravity tubes
- fixed very nasty bug in SDL_image (and X11) PCX loading routine
- fixed some very nasty bugs in bitmap zoom routine
- fixed very nasty bug in level/artwork loading routine
@
text
@d3 1
a3 1
--- src/libgame/system.c.orig	2003-08-04 23:01:27.000000000 +0200
d5 1
a5 1
@@@@ -1163,10 +1163,16 @@@@ inline void InitJoysticks()
d10 1
a10 2
+   * the state variable 'joystick' only if there's no joystick available
+   * (yet).
d14 1
a14 1
-  for (i=0; i<MAX_PLAYERS; i++)
d16 1
a16 2
+  if (joystick.status == JOYSTICK_NOT_AVAILABLE)
+  {
@


1.1
log
@Bump package revision to 1. New patch-ak fixes bug in Joystick support
(tested on i386).
@
text
@d3 1
a3 1
--- src/libgame/system.c.orig	Sat Aug 10 15:09:49 2002
d5 1
a5 1
@@@@ -874,10 +874,16 @@@@
@