Commit Graph

2118 Commits (87f96d327e629375514a279e834452e0a3f7cc92)

Author SHA1 Message Date
Giel van Schijndel 87f96d327e * Make compilation of QuesoGLC optional (i.e. add a --disable-quesoglc to the configure script)
* Disable compiling of QuesoGLC when creating a Debian package


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2728 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 17:04:30 +00:00
Giel van Schijndel 48d2483de6 * Bump upstream version number (revision number)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2727 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 15:53:15 +00:00
Giel van Schijndel 9fd3c1a7f1 * Make conversion tool "imgfile" also output the file-format-version
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2726 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 15:49:43 +00:00
Giel van Schijndel 811eafc0af * Add a directory for conversion tools (conversion from some internal WZ format to another format)
* Add conversion tool '''imgfile'''
  * This tool will read in an "IMG" file ("IMG" is the WRF identifier) from standard intput; it'll then reformat it as XML and output it to standard output


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2725 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 15:41:27 +00:00
Giel van Schijndel bb1fd8660a * Enlarge mission timer field to be able to contain the text
* Enlarge transportation timer field to be able to contain the time text

patch #831 by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2724 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 15:32:52 +00:00
Giel van Schijndel 03c4fd6256 * Add version.[ch]
* this module uses the information extracted from the automatically generated file src/autorevision.h to add revision information to the project
  * provides a function version_getFormattedVersionString() which replaces several pieces of customly crafted code to dump a version string (frontend.c, main.c and clparse.c)
 * update po/POTFILES.in
  * add some recently added files
 * make -C po update-po


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2723 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 02:31:09 +00:00
Giel van Schijndel 59c1b8fc11 * Add AutoRevision to raw makefile system
* Set raw makefiles up to use AutoRevision to generate src/autorevision.h

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2722 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 02:29:46 +00:00
Giel van Schijndel 71a6991cd7 * Add a new revision info extraction class (subclass of RevisionExtractor): RevConfigFile
* This class extracts revision info from a "var=value" style text file (can be used in tarballs)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2721 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 01:41:59 +00:00
Giel van Schijndel eebb1dd97f * Add struct RevisionInformation to bind all revision info together
* Add a new subclass of RevisionExtractor: RevSVNVersionQuery
  * This subclass will use "svnversion" to additionally detect mixed revisions, modifications and switched paths in working copies
 * Add the "low revision", modification and switch state to the output


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2720 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 23:08:17 +00:00
Per Inge Mathisen cdeeffb93b Clean out dead code. Allow keymap function table to contain NULL entries for removed
key bindings (list must not be shortened, this to prevent invalidating users' keymaps!).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2719 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 22:51:37 +00:00
Giel van Schijndel 93c387f1fb * Change "failed to open file" error message, when attempting to load a playlist, from LOG_ERROR to LOG_NEVER as it isn't a real error condition
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2717 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 18:45:57 +00:00
Giel van Schijndel 39e6d26a1f * Add an abstract base class for the extraction of revision information: RevisionExtractor
* This class uses the "Chain of Responsibility" pattern to delegate a task the current subclass cannot perform to a successor in the chain
 * Make QuerySVN() and ParseFile() part of subclasses derived from RevisionExtractor
  * Also make these functions function properly in the chain of responsibility


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2716 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 18:20:00 +00:00
Dennis Schridde c91a285fe6 - Move definitions of special tiles together in display3d.c (Water, riverbed, passable rubbles, unpassable rubbles)
- Provide macors for unpassable rubbles and water, since the underwater and rubble tiles can be overridden by map version 15


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2715 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 17:00:28 +00:00
Dennis Schridde 8fd75e854c Only try to build QuesoGLC if we downloaded the svn:external. Should fix it for source tarballs and exotic svn updaters.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2714 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 16:59:35 +00:00
Dennis Schridde 7ca4f62452 Recurse into QuesoGLC directory for building. Not fully complete, since we cannot yet use the result of that.
Need to investigate further on howto best setup autotools to accomplish that.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2713 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 16:29:20 +00:00
Giel van Schijndel 6268b6fff2 * Don't allocate memory in PlayList_Init() while we don't need it yet
* Make sure to set '''global''' pointers to NULL when free()ing them
 * Also set the "size" variables belonging to these pointers to zero
* Use a swap(a, b) style function for variable swapping (in PlayList_Shuffle()) rather than obfuscating code
* Make sure that PlayList_CurrentSong() and PlayList_NextSong() return "const char*" rather than "char*" to make sure no one touches memory he/she shouldn't
* Some general changes to conform with coding style (most notably: braces on a line of their own)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2712 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 16:14:24 +00:00
Giel van Schijndel aa4bb6c529 * Prevent a segfault occuring when quitting from warzone if a non-power of two number of tracks has been loaded into a playlist (due to uninitialized pointers)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2711 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 16:05:11 +00:00
Per Inge Mathisen eeae9829cd More cleanup of globals
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2710 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 15:52:34 +00:00
Giel van Schijndel 7a01000da9 * Clean up some of the playlist code:
* Make PlayList_Read return a bool instead of char (using 'char' there was a perfect example of premature optimisation; to save memory most likely)
   * Remove macro CURRENT_TRACK which expanded to playlist[current_track] (it did _not_ increase readability)
   * Make sure to free resources from __all__ return paths from PlayList_Read
   * Check realloc's return value
   * Don't bitshift but multiply!
   * Make sure to follow coding style (in PlayList_Read)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2709 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 15:24:37 +00:00
Giel van Schijndel 5efc500f88 * Fix a bug where (in some cases) file names in the music.wpl playlist would be truncated
Bug reported by Jessicatz (on IRC)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2708 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 15:16:56 +00:00
Per Inge Mathisen 4e594f0f8b Remove unused globals
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2707 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 15:04:43 +00:00
Per Inge Mathisen 6d6d3ca817 Remove undocumented --noTranslucent commandline option
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2706 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 14:48:20 +00:00
Per Inge Mathisen 7f737d30f1 Fix bug #9652 where water edge would transition to black instead of water when
mouse was positioned over a research or production item.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2705 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 13:38:56 +00:00
Per Inge Mathisen e624663f40 Now that we draw water in a separate pass, we can reduce the number of state changes a lot.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2704 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 13:26:04 +00:00
Per Inge Mathisen f1e9c680a4 Do not use bucket sort for water tiles, instead draw terrain in two passes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2703 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 23:23:10 +00:00
Per Inge Mathisen 01e24bf6ed Clean up pieblitfunc. Dump dead code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2702 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:48:46 +00:00
Giel van Schijndel f1d91e0598 * Remove the "Published by EIDOS Interactive" and "Developed by Pumpkin Studios" strings from the ingame pause screen/menu
* Update translation files to have these changes embedded


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2701 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:44:36 +00:00
Dennis Schridde 3a141f2c82 Add property to bind quesoglc
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2700 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:34:13 +00:00
Dennis Schridde f851174e8e Proper linking order
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2699 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:13:35 +00:00
Dennis Schridde 2d94849fbc Update po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2698 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:13:05 +00:00
Dennis Schridde 94136efe24 Revert to the non-global static_assert, since MSVC is not ready for the global one, yet.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2697 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 21:42:55 +00:00
Per Inge Mathisen e3fcef4ace Complete the implementation of ECM (Electronic Counter Measures) in the code.
This is still a preliminary implementation, but works. If a source object tries
to see a target object whose ECM power is higher than the source object's sensor
power, the source sensor range is reduced by one third. Cyborgs get an innate
ECM power bonus, and enemies now need to be one third closer to hit them.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2695 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 20:22:40 +00:00
Per Inge Mathisen c4a30cc54b Remove dead code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2694 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 20:01:30 +00:00
Dennis Schridde e25960c5a4 Remove unnecessary comment and addition to the commitmessage of the last commit (r2692):
& TILE_NUMMASK -> function TileNumber_tile(), & ~TILE_NUMMASK -> TileNumber_texture()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2693 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 18:52:22 +00:00
Dennis Schridde 33d42e3119 macro TERRAIN_TYPE -> function terrainType
int visibleXTiles -> Vector2i visibleTiles


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2692 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 18:48:47 +00:00
Stefan Huehner 3b3199b7f9 remove the text.h include from a lot of files
which dont need its declarations


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2691 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 17:49:53 +00:00
Per Inge Mathisen bc6bd2db1e Fix memory leak when more groups are created than released. See patch #826
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2690 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 17:31:11 +00:00
Per Inge Mathisen 99098a55b6 Silence two more type punning warnings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2689 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 16:35:39 +00:00
Per Inge Mathisen ca222db4fe Clean up flip and rotation code. Reduce use of static globals.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2688 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 16:13:54 +00:00
Per Inge Mathisen 2ac16d28c4 Remove dead code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2687 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 15:08:06 +00:00
Giel van Schijndel c76b591954 * In audio_StopAll() __always__ set psSample->psObj to NULL; this should fix bug #9233 (and bug #9927, which most likely is a duplicate, as well)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2684 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 02:07:25 +00:00
Giel van Schijndel e3b3379a83 * Replace malloc() calls immediately followed by memset(0) calls by calloc() calls instead
* Refactor a linked list iteration to for-loop
 * In audio_StopAll() check whether psSample->psObj is marked for deletion (i.e. audio_ObjectDead(psSample->psObj) returns true); if it is, set the pointer to NULL


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2683 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 01:55:11 +00:00
Giel van Schijndel f69387aa93 * Ignore 4204 warning on MSVC (non-constant aggregrate initializer; aka non-constant struct initializer)
Patch by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2682 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 23:33:34 +00:00
Giel van Schijndel 533e7e92bf * Use spaces for line-out purposes (rather than tabs)
* Tune down the volume of the oil-pumps, power-spikes and power hums a bit, to make them less dominant (and annoying) (from patch #822 by Buginator)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2681 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 22:37:20 +00:00
Giel van Schijndel a316f10a0e * Don't save the volume with user volume preferences applied (instead save the track-volume so recomputing will be possible)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2680 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 22:19:06 +00:00
Giel van Schijndel 2f3e74a107 * Add include guards to source:trunk/lib/ivis_common/pievector.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2679 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 19:43:56 +00:00
Giel van Schijndel e19e8814b6 * Add a GPL (v2 or later) header to source:trunk/lib/ivis_common/pievector.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2678 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 19:41:04 +00:00
Per Inge Mathisen ec232d7e0f Actually use audio.cfg configuration of sound volume. Patch by Buginator in patch #822
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2677 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 18:47:22 +00:00
Giel van Schijndel 9d83e2ac7a * Make sure to align publisher text out to the right _correctly_
* Changeset inspired by patch #822 by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2676 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-01 20:19:27 +00:00
Per Inge Mathisen 5f39fd4fe1 Add testdata to list of directories to add to warzone.wz in Makefile.raw too
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2675 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-31 17:40:55 +00:00