Commit Graph

2406 Commits (2ff8addf562ec640eb5a574c532aacb247933dc5)

Author SHA1 Message Date
Per Inge Mathisen 2ff8addf56 Fix fog debug messages that said the opposite of what they meant.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3074 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 15:15:01 +00:00
Dennis Schridde 79a8dec64d Correct my misinterpretation of the license (BY-SA instead of BY-ND) and include a copy of it to fullfil the terms.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3073 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 14:21:06 +00:00
Freddie Witherden d24cf2c233 Update the OS X project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3072 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 12:05:13 +00:00
Dennis Schridde faa13221b3 Import Pre-GPL changelog, as found in 0.2.2's update.rtf. Dates are entirely missing!! Any veterans knowing them (or at least the year or month) are encouraged to fill the gap.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3071 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 10:23:09 +00:00
Dennis Schridde 13fa6cb3d3 Add N.E.W.S.T. tilesets as found in warzone2100-0.2.2 (source-tarball).
Licensed from Rman Virgil under CC 3.0 by-nd. (http://creativecommons.org/licenses/by-nd/3.0/)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3070 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 00:47:44 +00:00
Ari Johnson 6cc628f38b Tiny change to Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3069 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:42:29 +00:00
Ari Johnson 0a9bcf08a3 Xcode project can almost build trunk again. This commit allows the project
to download and build the external libraries that Warzone has added since
the last time that trunk would build under Xcode.  The actual game currently
will not build due to other issues, but this is phase 1.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3068 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:34:51 +00:00
Gerard Krol 4884837ded Relax camera movement while still preventing clipping through the terrain. Also disable panning to the default angle when releasing the
right mouse button.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3067 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:33:24 +00:00
Giel van Schijndel eba3731a93 * Put some duplicated code for destroying sound samples in function sound_DestroyIteratedSample
* If in sound_Update() we encounter an error simply destroy the current sample we're working on


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3066 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 20:49:02 +00:00
Freddie Witherden c4fe7ad919 Update BASE_OBJECT and friends to use Vector3i.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3065 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 15:39:29 +00:00
Gerard Krol 65c56b73e3 Fix an invalid pointer reference in the widget code by making sure that the pointer to the widget currently under the mouse is cleared when the
widget is freed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3064 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 14:33:56 +00:00
Per Inge Mathisen e0c450b415 Remove excess display related code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3062 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 12:18:56 +00:00
Per Inge Mathisen 5417afae46 Read tile colour information directly from mapTiles, instead of going through tileScreenInfo
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3057 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 11:08:23 +00:00
Per Inge Mathisen 80d6e7df6d Use setTileColour accessor for tile lighting.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3055 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 16:27:39 +00:00
Per Inge Mathisen 0484f5e383 We no longer need .wlight to separately store water colour.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3054 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 16:21:12 +00:00
Giel van Schijndel 8fcd2410be * Apply the last bit of patch #884 by Buginator (openal_track.c)
* Make sure that sound_GetError and sound_GetDeviceError are useable in WZ_NOSOUND builds as well


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3053 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 15:11:59 +00:00
Giel van Schijndel d179c09f17 * Fix some errors in openal_track.c; part of patch #884 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3052 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 12:13:23 +00:00
Giel van Schijndel 456208fcc3 * Update MSVC project files (part of patch #884 by Buginator)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3051 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 12:12:36 +00:00
Giel van Schijndel 22f762a3c3 * Prevent a linker error when compiling with -DWZ_NOUSOUND (sound_RemoveActiveSample was used but not defined)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3050 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 11:43:15 +00:00
Giel van Schijndel 992ee8583a * Fix yet another bug introduced in r3047 (the game would hang in an infinite loop because of failing to increase the iterators)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3049 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:54:28 +00:00
Giel van Schijndel ff44e8c84c * Fix a bug introduced in r3047 (segfault due to failing to check for a NULL pointer)
* Apply patch #879 by Buginator (refactored by me to use less handcrafted code, and more functions instead)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3048 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:47:46 +00:00
Giel van Schijndel 99c55dbf74 * Try to encapsulate knowledge about AUDIO_SAMPLE's internal representation in openal_track.c (i.e. don't use it in client code!)
* Look at sound_StopSample specifically
 * Use a function to manipulate the linked list of audio samples (i.e. get rid of duplicated code)
 * Allow printing of OpenAL vendor, version, renderer and extensions data on multiple debug "channels" to reduce code duplication
 * Add openal_error.[ch] for error detection (and producing debug messages for them!)
 * Add TOSTRING and AT_MACRO macros to macros.h
 * Get rid of some super-nested if-branches where one of them would return (so we don't actually need an else-branch because the function is left anyway)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3047 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 23:16:03 +00:00
Per Inge Mathisen 9c8e54520f Clean up terrain colour handling a bit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3046 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 22:00:54 +00:00
Per Inge Mathisen cf0007f8be Make sure we do not access tiles outside the map when checking height for
identified flying objects. Patch #880 by Buginator.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3045 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 19:13:11 +00:00
Per Inge Mathisen 1a89fbb9bc Remove legacy PSX way of generating visual fog by manipulating vertex colours. Instead
we rely on real OpenGL visual fog. Someone need to look at what scripts need in this
department - the difference between distance and depth fog was almost non-existent
before this change, and is none after, but we have lots of parameters we can easily tune
now from the scripts if we want.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3044 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 18:08:37 +00:00
Dennis Schridde e7f0dff4a4 Add Buginator to the authors list and add a missing dot to Tim's P
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3043 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-13 15:02:45 +00:00
Giel van Schijndel 5d8d9e193e * Remove useless rotating angle from drawTiles (it is being set and incremented but never actually used/read)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3042 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-12 22:45:17 +00:00
Giel van Schijndel 5f1977c7f6 * Remove #undef WZ_NOMP3 and #define VERSION from config-macosx.h as they're both not needed anymore...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3041 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-12 21:19:29 +00:00
Dennis Schridde 20050d2a3e Add some more output do debug dumps: The maintainer who created the package.
PACKAGE_MAINTAINER and PACKAGE_VERSION should probably also make their way into the logfile...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3040 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-12 18:34:30 +00:00
Gerard Krol e48ec1019d Doxygen comments and some minor beautifications.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3039 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-11 19:36:52 +00:00
Gerard Krol c580835c31 Set the output directory for doxygen to doc/code and enable JAVADOC_AUTOBRIEF.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3038 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-11 19:34:52 +00:00
Giel van Schijndel c51bd8ae10 * Get rid of a large quantity of unused parameters
* Turn some signed integers ("int" or "SDWORD") into unsigned integers where it made more sence (and signed integers caused warnings about comparing signed with unsigned integers)
 * At some places cast to an unsigned integer (where the type of the expression is a signed integer but the result of it logically _always_ is an absolute value)
 * Remove unused struct-type EVENT_INIT
 * Convert use of malloc->memcpy->free to one single realloc call (and now make sure to actually check realloc's return value, which wasn't done with the malloc call)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3037 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 23:15:46 +00:00
Per Inge Mathisen 6118371c0e Add methods to read/write byte arrays to tagfile format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3036 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 21:48:27 +00:00
Dennis Schridde 7485b20097 Require flex-2.5.33 (current version in Debian stable), since Gerard ran into warnings with 2.5.4.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3035 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 21:21:19 +00:00
Gerard Krol b94ac89c03 Revert 3032, as we don't need to support old versions of Flex.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3034 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 21:14:57 +00:00
Per Inge Mathisen fc0db340ce Add info and visibility bits to saved tiles in the tagfile format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3033 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 20:58:26 +00:00
Gerard Krol a8ffb9b8c2 Add -Wno-unused-function to the compilation options for --enable-debug=yes to silence a warning from flex (GCC4.2, AMD64, Debian Testing).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3032 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 20:40:09 +00:00
Gerard Krol 6cb9bdcbef Write the resolution specified on the command line to the configuration file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3031 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 20:08:39 +00:00
Freddie Witherden 9710d4e4a7 Update the QualityFactor function in projectile.c to hopefully make it fairer and more stable.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3030 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 19:00:43 +00:00
Freddie Witherden 2506b69e1f Add a CLIP macro for culling a value between a min and max value.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3029 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 18:36:07 +00:00
Giel van Schijndel 78a5853309 make -C po update-po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3027 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 23:39:01 +00:00
Giel van Schijndel 51c32760b4 * Fix a bug where would free the wrong pointer (thanks to Buginator for spotting it)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3026 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 23:35:56 +00:00
Giel van Schijndel 7c4e237187 * Apparently the UTF-8 conversion of r3024 wasn't complete; it should be now
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3025 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 23:29:26 +00:00
Giel van Schijndel fc55c1b8ca * Set charset of de.po to UTF-8 (just as all the rest of the files are)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3024 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 23:16:37 +00:00
Giel van Schijndel cc12f08b1a * Apply patch #879 by Buginator with some heavy modifications by me
* Upon removing BASE_OBJECTs loop through the lists of outstanding AUDIO_SAMPLEs to delete all of those that refer to this BASE_OBJECT


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3023 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 22:36:06 +00:00
Per Inge Mathisen 6c4c61fbb7 PIELIGHT fix for map hightlight. Remove use of colours to communicate a boolean value.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3022 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 21:50:47 +00:00
Per Inge Mathisen da7b96315c Final PIELIGHT changes to the widget code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3021 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 21:40:26 +00:00
Dennis Schridde c64b565f14 Patch #872 by Buginator. Untested by me since in Bugs we trust. ;)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3020 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 19:10:34 +00:00
Per Inge Mathisen 53f11c391f Add a new vector field to the PIELIGHT union, and send colours to OpenGL
as arrays rather than as individual bytes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3019 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 17:41:00 +00:00
Per Inge Mathisen 4ee90ba9e3 Adapt radar view to PIELIGHT scheme. The radar colours have been changed a lot, and
we probably need to massage these colours a bit before release. Radar tile colours 
in all but objects only mode are a complicated blend of tile height and colour. Closes
patch #858.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3018 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 17:23:34 +00:00