[Enigma-cvs] enigma CHANGES, 1.6, 1.7 Makefile.am, 1.25, 1.26 NEWS, 1.24, 1.25 aclocal.m4, 1.5, 1.6 configure.ac, 1.10, 1.11 acconfig.h, 1.2, NONE

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma
In directory subversions:/tmp/cvs-serv9138

Modified Files:
        CHANGES Makefile.am NEWS aclocal.m4 configure.ac 
Removed Files:
        acconfig.h 
Log Message:
Merged changes from 0_80_rc branch

Index: CHANGES
===================================================================
RCS file: /cvsroot/enigma/enigma/CHANGES,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CHANGES     14 Sep 2003 19:32:35 -0000      1.6
--- CHANGES     18 Oct 2003 13:48:58 -0000      1.7
***************
*** 1,5 ****
--- 1,27 ----
+ Changes in Version 0.81
+ =======================
+ 
+ User-Visible Changes
+ --------------------
+ 
+ * Fixed bug which caused all levels to be restarted when the marble
+   died.
+ 
+ Internal Changes
+ ----------------
+ 
+ * Changed a few object names
+ 
+       it-seed_vulcano -> it-seed_volcano
+       st-vulcano -> st-volcano
+       st-vulcano-growing -> st-volcano-growing
+ 
+ 
  Changes in Version 0.80
  =======================
  
+ User-Visible Changes
+ --------------------
+ 
    * Time game
    * Easy / difficult game mode
***************
*** 13,151 ****
    * Reduced memory footprint
  
- New Lua Variables
- -----------------
  
! enigma.AllowTogglePlayer = TRUE | FALSE
! enigma.ShowMoves = TRUE | FALSE
! enigma.Brittleness = 0 .. 1
! enigma.SlopeForce
! enigma.SlopeForce2
! enigma.FrictionFactor
! enigma.ElectricForce
  
  
! New Actor Types
! ---------------
  
- ac-bug
- ac-killerball
- ac-rotator
- ac-top
  
  
! New Stone Types
! ---------------
  
- st-actorimpulse_invisible
- st-beads
- st-block
- st-blocker
- st-blue-sand
- st-bolder-[nesw]
- st-brake
- st-break_bolder
- st-break_invisible
- st-chargeminus
- st-chargeplus
- st-chargezero
- st-death_invisible
- st-disco-dark
- st-disco-light
- st-disco-medium
- st-easymode
- st-fourswitch
- st-glass_hole
- st-glass_move
- st-knight
- st-laserswitch
- st-likeoxyd[abcd]
- st-mail
- st-plain
- st-pull
- st-rock3_movebreak
- st-rotator-left
- st-rotator-right
- st-rotator_move-left
- st-rotator_move-right
- st-stoneimpulse_movable
- st-switch_black
- st-switch_white
- st-timeswitch
- st-turnstile
- st-turnstile-[nesw]
- st-turnstile-green
- st-vulcano
- st-vulcano_active
- st-vulcano_inactive
- st-window
- st-wood1
- st-wood2
- st-yellow
  
! New Item Types
! --------------
  
! it-abyss
! it-blocker
! it-brake
! it-burnable
! it-burnable-ash
! it-burnable-fireproof
! it-burnable-ignited
! it-cherry
! it-coffee
! it-easymode
! it-extinguisher
! it-extinguisher-empty
! it-extinguisher-full
! it-flagblack
! it-flagwhite
! it-glasses
! it-glasses-broken
! it-hstrip
! it-inversesensor
! it-landmine
! it-odometer
! it-pin
! it-puller-[nesw]
! it-seed
! it-seed_nowood
! it-seed_vulcano
! it-seed_wood
! it-sensor
! it-soother
! it-springboard
! it-vortex-closed
! it-vortex-open
! it-vstrip
! it-weight
! it-whitebomb
! it-wrench
  
  
! New Floor Types
! ---------------
  
! fl-abyss_fake
! fl-acwhite
! fl-acblack
! fl-black
! fl-bumps
! fl-concrete
! fl-gravel
! fl-light
! fl-mortar
! fl-red
! fl-rock
! fl-rough-blue
! fl-rough-red
! fl-rough_medium
! fl-rough_slow
! fl-springboard
! fl-stwood
! fl-stwood1
! fl-stwood1
! fl-stwood2
! fl-stwood2
! fl-white
  
--- 35,186 ----
    * Reduced memory footprint
  
  
! Internal Changes
! ----------------
  
+ * New Lua Variables
  
!       enigma.AllowTogglePlayer = TRUE | FALSE
!       enigma.ShowMoves = TRUE | FALSE
!       enigma.Brittleness = 0 .. 1
!       enigma.SlopeForce
!       enigma.SlopeForce2
!       enigma.FrictionFactor
!       enigma.ElectricForce
!       enigma.BumperForce
  
  
+ * New Actor Types
  
!       ac-bug
!       ac-killerball
!       ac-rotator
!       ac-top
  
  
! * New Stone Types
  
!       st-actorimpulse_invisible
!       st-beads
!       st-block
!       st-blocker
!       st-blue-sand
!       st-bolder-[nesw]
!       st-brake
!       st-break_bolder
!       st-break_invisible
!       st-chargeminus
!       st-chargeplus
!       st-chargezero
!       st-death_invisible
!       st-disco-dark
!       st-disco-light
!       st-disco-medium
!       st-door-h
!       st-door-h-open
!       st-door-v
!       st-door-v-open
!       st-easymode
!       st-fourswitch
!       st-glass_hole
!       st-glass_move
!       st-knight
!       st-laserswitch
!       st-likeoxyd[abcd]
!       st-mail
!       st-oneway-[nesw]
!       st-oneway_black-[nesw]
!       st-oneway_white-[nesw]
!       st-plain
!       st-pull
!       st-puzzle-[nesw]
!       st-puzzle-{ne, ns, nw, es, ew, sw}
!       st-puzzle-{nes, new, nsw, esw, nesw}
!       st-puzzle2-[nesw]
!       st-puzzle2-{ne, ns, nw, es, ew, sw}
!       st-puzzle2-{nes, new, nsw, esw, nesw}
!       st-rock3_movebreak
!       st-rotator-left
!       st-rotator-right
!       st-rotator_move-left
!       st-rotator_move-right
!       st-shogun-{s, m, l, sm, sl, ml, sml}
!       st-stoneimpulse_movable
!       st-switch_black
!       st-switch_white
!       st-timeswitch
!       st-turnstile
!       st-turnstile-[nesw]
!       st-turnstile-green
!       st-volcano
!       st-volcano_active
!       st-volcano_inactive
!       st-window
!       st-wood1
!       st-wood2
!       st-yellow
  
+ * New Item Types
  
!       it-abyss
!       it-blocker
!       it-brake
!       it-burnable
!       it-burnable-ash
!       it-burnable-fireproof
!       it-burnable-ignited
!       it-cherry
!       it-coffee
!       it-easymode
!       it-extinguisher
!       it-extinguisher-empty
!       it-extinguisher-full
!       it-flagblack
!       it-flagwhite
!       it-glasses
!       it-glasses-broken
!       it-hstrip
!       it-inversesensor
!       it-landmine
!       it-odometer
!       it-pin
!       it-puller-[nesw]
!       it-seed
!       it-seed_nowood
!       it-seed_volcano
!       it-seed_wood
!       it-sensor
!       it-soother
!       it-springboard
!       it-vortex-closed
!       it-vortex-open
!       it-vstrip
!       it-weight
!       it-whitebomb
!       it-wrench
  
! * New Floor Types
! 
!       fl-abyss_fake
!       fl-acwhite
!       fl-acblack
!       fl-black
!       fl-bumps
!       fl-concrete
!       fl-gravel
!       fl-light
!       fl-mortar
!       fl-red
!       fl-rock
!       fl-rough-blue
!       fl-rough-red
!       fl-rough_medium
!       fl-rough_slow
!       fl-springboard
!       fl-stwood
!       fl-stwood1
!       fl-stwood1
!       fl-stwood2
!       fl-stwood2
!       fl-white
  

Index: NEWS
===================================================================
RCS file: /cvsroot/enigma/enigma/NEWS,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** NEWS        14 Sep 2003 19:32:35 -0000      1.24
--- NEWS        18 Oct 2003 13:48:58 -0000      1.25
***************
*** 1,3 ****
! Version 0.80 (Sep xx 2003)
  
    * Time game
--- 1,7 ----
! Version 0.81 (Oct 11 2003)
! 
!   * Mainly bugfixes
! 
! Version 0.80 (Oct 08 2003)
  
    * Time game
***************
*** 5,14 ****
    * Sokoban mode
    * Game manual
!   * More than 300 new levels (now more than 550 in total)
    * Better soft scrolling
    * Countless new game elements: turnstiles, volcanos, warp tunnels,
      land-mines, jump pads, rotors, ...
    * Reduced memory footprint
- 
  
  Version 0.70 (Feb 14 2003)
--- 9,17 ----
    * Sokoban mode
    * Game manual
!   * More than 300 new levels (now more than 580 in total)
    * Better soft scrolling
    * Countless new game elements: turnstiles, volcanos, warp tunnels,
      land-mines, jump pads, rotors, ...
    * Reduced memory footprint
  
  Version 0.70 (Feb 14 2003)

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/enigma/enigma/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aclocal.m4  14 Sep 2003 19:44:45 -0000      1.5
--- aclocal.m4  18 Oct 2003 13:48:58 -0000      1.6
***************
*** 850,879 ****
  fi])])
  
- # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
- 
- # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
- 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2, or (at your option)
- # any later version.
- 
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- 
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
- 
- AC_PREREQ([2.52])
- 
- # serial 6
- 
- # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
- 
  # Configure paths for SDL
  # Sam Lantinga 9/21/99
--- 850,853 ----

--- acconfig.h DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/enigma/enigma/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Makefile.am 14 Sep 2003 19:32:35 -0000      1.25
--- Makefile.am 18 Oct 2003 13:48:58 -0000      1.26
***************
*** 2,41 ****
  EXTRA_DIST = enigma CHANGES
  
! #------------------ Packaging rules for Mac OSX ------------------------
! 
! bundle_name = Enigma.app
! # Special target to copy all needed game files to 
Enigma.app/Contents/Resources.
! # For Mac OS X bundle.
! bundle:
!       mkdir -p $(bundle_name)/Contents/MacOS
!       mkdir -p $(bundle_name)/Contents/Resources
!       echo "APPL????" > $(bundle_name)/Contents/PkgInfo
!       cp Info.plist $(bundle_name)/Contents/
!       cp enigma.icns $(bundle_name)/Contents/Resources/
!       cp -R data/levels $(bundle_name)/Contents/Resources/
!       cp data/*.lua $(bundle_name)/Contents/Resources/
!       cp -R data/gfx $(bundle_name)/Contents/Resources/
!       cp -R data/sound $(bundle_name)/Contents/Resources/
!       mkdir -p $(bundle_name)/Contents/Resources/fonts
!       cp data/fonts/*.png $(bundle_name)/Contents/Resources/fonts
!       cp data/fonts/*.bmf $(bundle_name)/Contents/Resources/fonts
! 
! # Special target to copy the binary to Enigma.app/Contents/MacOS.
! bundle-static: enigma-static-mosx bundle
!       cp enigma-static $(bundle_name)/Contents/MacOS/enigma
!       strip $(bundle_name)/Contents/MacOS/enigma
! 
! # Special target to copy the binary to Enigma.app/Contents/MacOS.
! bundle-fw: enigma-fw-mosx bundle
!       cp enigma-fw $(bundle_name)/Contents/MacOS/enigma
!       strip $(bundle_name)/Contents/MacOS/enigma
! 
! # Special target to create a static linked binary for Mac OS X
! # FIXME: hardcoded library paths because of braindamaged linker
! enigma-static-mosx: $(enigma_OBJECTS) $(enigma_DEPENDENCIES)
!       $(CXX) $(LDFLAGS) -o enigma-static $(enigma_OBJECTS) 
$(enigma_DEPENDENCIES) /usr/fink/lib/libSDLmain.a /usr/fink/lib/libSDL.a 
/usr/fink/lib/libSDL_image.a /usr/fink/lib/libSDL_mixer.a 
/usr/fink/lib/liblua.a /usr/fink/lib/liblualib.a /usr/fink/lib/libsmpeg.a 
/usr/fink/lib/libpng.a /usr/fink/lib/libjpeg.a /usr/fink/lib/libvorbisfile.a 
/usr/fink/lib/libvorbis.a /usr/fink/lib/libogg.a -lz -framework IOKit 
-framework Cocoa -framework OpenGL -framework Carbon -framework QuickTime
! 
! # Special target to create a binary linked with Mac OS X frameworks
! enigma-fw-mosx: $(enigma_OBJECTS) $(enigma_DEPENDENCIES)
!       $(CXX) $(LDFLAGS) -o enigma-fw $(enigma_OBJECTS) $(enigma_DEPENDENCIES) 
-lsdlmain -lz -framework SDL -framework SDL_image -framework SDL_mixer 
-framework IOKit -framework Cocoa -framework OpenGL -framework Carbon 
-framework QuickTime 
! 
--- 2,5 ----
  EXTRA_DIST = enigma CHANGES
  
! docdir = @datadir@/doc/enigma
! doc_DATA = README NEWS CHANGES COPYING

Index: configure.ac
===================================================================
RCS file: /cvsroot/enigma/enigma/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configure.ac        14 Sep 2003 19:32:35 -0000      1.10
--- configure.ac        18 Oct 2003 13:48:58 -0000      1.11
***************
*** 1,10 ****
  # Process this file with autoconf to produce a configure script.
! AC_INIT
! AC_CONFIG_SRCDIR([src/enigma.cc])
  AC_CANONICAL_BUILD
  AC_CANONICAL_TARGET
! dnl AC_CANONICAL_HOST
! AM_INIT_AUTOMAKE(enigma, 0.80-beta)
! AM_CONFIG_HEADER(src/config.h)
  
  dnl ======================================================================
--- 1,10 ----
  # Process this file with autoconf to produce a configure script.
! AC_INIT([enigma],[0.81])
  AC_CANONICAL_BUILD
  AC_CANONICAL_TARGET
! AC_CONFIG_SRCDIR([src/enigma.cc])
! 
! AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -)
! AM_CONFIG_HEADER([src/config.h])
  
  dnl ======================================================================
***************
*** 29,32 ****
--- 29,33 ----
  
  AC_PATH_PROG(TEXI2HTML, texi2html, "")
+ AC_PATH_PROG(TOLUA, tolua, "")
  
  dnl ======================================================================
***************
*** 148,165 ****
  dnl Setup default search path for game data
  FC_EXPAND_DIR(ENIGMA_DATADIR, "$datadir/enigma")
! AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, "./data:~/.enigma:$ENIGMA_DATADIR", 
[Default data dir])
  
! dnl Avoid calling AC_CONFIG_SUBDIRS if one of the --enable 
! dnl options has been given
! dnl if test "x$enable_profile x$enable_optimize x$enable_debug_gdb 
x$enable_warnings" = "xno xno xno xno" ; then
!     dnl Subdirs which need to be configured:
!     AC_CONFIG_SUBDIRS(lib-src/zipios++)
! dnl else
! dnl     echo
! dnl     echo "Warning: Cannot call ./lib-src/zipios++/configure because"
! dnl     echo "it does not understand all --enable... options."
! dnl     echo "Continuing ..."
! dnl     echo
! dnl fi
  
  AC_CONFIG_FILES([Makefile
--- 149,156 ----
  dnl Setup default search path for game data
  FC_EXPAND_DIR(ENIGMA_DATADIR, "$datadir/enigma")
! AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, "./data:~/.enigma:$ENIGMA_DATADIR", 
[Default data directory])
  
! dnl Configure libraries
! AC_CONFIG_SUBDIRS(lib-src/zipios++)
  
  AC_CONFIG_FILES([Makefile
***************
*** 182,185 ****
--- 173,177 ----
           tools/Makefile
           etc/enigma.spec
+          etc/mingw32-dist.sh
  ])
  AC_OUTPUT