Commit Graph

2359 Commits (c64b565f141b550474eb5d1e33c0070457b91943)

Author SHA1 Message Date
Giel van Schijndel 9f114081fb * Update Doxygen comment for version_getFormattedVersionString (forgot to include this change in r2783)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2784 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 18:46:03 +00:00
Giel van Schijndel bad236f4a9 * Make the <BUILD DATE> part of the formatted version string optional
* Don't include it when we're building from a tag


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2783 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 18:42:32 +00:00
Per Inge Mathisen 8b14087c3a Remove multiweapon orders. Multiple weapons do not need separate orders.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2782 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 17:31:37 +00:00
Giel van Schijndel 45ea795b10 * Move sDelete into local scope (was only used in one function anyway)
* Move sTemp into a __more__ local scope
 * Don't strip an extension from a string we aren't going to use anyway...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2781 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 16:21:26 +00:00
Per Inge Mathisen caa5e02217 A droid never has more than one target stats type, so revert the addition of
multiple target stats for droids from r857.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2780 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 15:26:10 +00:00
Per Inge Mathisen 3b07b90160 New function objCount which counts the number of objects in the game.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2779 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:59:05 +00:00
Per Inge Mathisen ff13be0b96 Do not disable lighting if it was never enabled in the first place, to avoid
doing unnecessary OpenGL state changes. Also make sure we turn off normalization.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2778 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:56:14 +00:00
Dennis Schridde 1dd2b54431 wzglobal.h never belonged to Eidos. Instead large parts of the code are copied from Qt and thus belong to Trolltech.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2776 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:25:02 +00:00
Dennis Schridde 5ccaa17971 Correct WZ_CC_TINYC check. (Note the namechange!)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2775 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 12:10:54 +00:00
Dennis Schridde 3a56a479b3 - Extend compiler detection with TinyCC
- Add window system detection
- Remove MSDOS from supported OSes


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2771 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 00:31:43 +00:00
Dennis Schridde 4ec3e1c03a update-po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2767 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 23:37:10 +00:00
Giel van Schijndel 24969666e1 * Remove incorrect text/plain mime-types
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2765 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 23:27:03 +00:00
Giel van Schijndel 9e6242b67f * Remove the 3rdparty dir as it (and its contents) isn't used right now
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2764 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 23:11:45 +00:00
Dennis Schridde 1d3ed30822 More UI ptr<->int fixes. !!WIP!!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2763 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 21:01:23 +00:00
Dennis Schridde cd586193d3 - Use UserData instead of pUserData to store non-pointer data in GUI system.
- Replace several occurances of (void*)0 with NULL.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2762 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 20:07:12 +00:00
Dennis Schridde 364a32d1de Remove QuesoGLC from the buildsystem. Reasons:
- It builds examples, etc. by default, which is annoying
- It will install along with Warzone, which is dangerous


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2761 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 19:32:01 +00:00
Freddie Witherden 17e60608cd Applied patch #839 by Buginator, which fixes a missing file close in map.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2760 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 18:16:03 +00:00
Dennis Schridde 223bc803e8 Use OLD_TEXTURE_SIZE_FIX instead of 256.0f to scale texcoords, to make clear that this is a fix for the old ...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2759 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 17:43:50 +00:00
Dennis Schridde d3c341421d src/wrappers.c: Simplify function and always display fireworks. (bug #5958 / patch #838) -> Should go into branches/2.0 !
src/keymap.c: Use function to access debug-mapping-status instead of global-var.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2758 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-08 23:49:43 +00:00
Dennis Schridde cc7840e866 change_int64_t_to_intptr_t.patch from patch #837 by <cybersphinx> Christian Ohm.
(Make WZ compile with the Tiny-C-Compiler by using the correct type for storing pointers as ints)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2757 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-08 23:11:59 +00:00
Dennis Schridde b7daedee14 Replaced NULL ptr with dummy kf_NOOP function so we don't crash on startup...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2756 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-08 23:01:13 +00:00
Dennis Schridde 9a06997527 Replace const + #define hackery with an enum.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2753 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-07 22:54:19 +00:00
Giel van Schijndel 7b0a6d7686 * Add a MSVC project file for AutoRevision
* Add it to the MSVC Workspace/Solution
 * Set svn:eol-style on the MSVC project & solution files to CRLF

Patch #832 by Buginator.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2752 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-07 15:13:09 +00:00
Giel van Schijndel 94b04775fb * Make sure that AutorRevision can be compiled even when using Unicode (makes lots of WINAPI functions accept UTF-16 LE instead of ASCII)
* Use SetEnvironmentVariableA instead of SetEnvironmentVariable which is a macro
Issue pointed out by Buginator

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2748 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 19:24:48 +00:00
Giel van Schijndel 6a2d26babd * Try '''harder''' to detect Windows platforms
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2747 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 19:17:36 +00:00
Giel van Schijndel 73d92d135f * Slight update to MSVC project file to decrease the diff-size (i.e. alphabetic ordering)
Part of patch #832 by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2746 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 18:57:53 +00:00
Giel van Schijndel 96d5054729 * Make sure to #include <stdio.h> when compiling on MSVC so that those inline replacements for snprintf and vsnprintf will actually compile....
* Lets terminate statements with a semi-colon!!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2745 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 18:36:37 +00:00
Giel van Schijndel 7b2530306c * On MSVC make sure to #define inline __before__ using it!!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2744 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 18:30:19 +00:00
Giel van Schijndel 9f9cc3b697 * When compiling AutoRevision on MSVC make sure to #define popen and pclose as _popen and _pclose respectively
Fix provided by Buginator in bug #10269


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2743 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 14:32:17 +00:00
Giel van Schijndel 92e013e406 * Add static inline functions vsnprintf and snprintf when compiling with MSVC
* These functions comply to the C99 specification and return the amount of characters they would have written if no truncation occurred
Slightly modified form of patch file #3146 attached to bug #10269 by Buginator; applied the changes of this patch to wzglobal.h instead of version.c


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2742 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-06 14:07:50 +00:00
Giel van Schijndel dc2e343a3b * "Unbreak" the keymap files which I broke in r2737
* Move the group 0 keymappings to the end of the keymapping function table


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2739 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 22:05:43 +00:00
Per Inge Mathisen 492784a667 Remove dead code to make water shadows move. It was probably not used because
it looked even more fake.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2738 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 21:59:21 +00:00
Giel van Schijndel b86a46d117 * Add the posibility to use the zero-key ('0') to assign groups to as well
NOTE: This __will__ break existing keymaps: please remove ~/.warzone2100-2.1/keymap.map
Patch #828 by Christian Ohm <cybersphinx>
PS: r2734 was based upon patch #829 (also by Christian Ohm <cybersphinx>); forgot that in that commit message, so adding it here instead


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2737 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 21:58:50 +00:00
Per Inge Mathisen bfdd5e66ca Make water blue in minimap. Please let me know how you like this change.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2736 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 21:42:59 +00:00
Per Inge Mathisen 0c9eb16089 Adjust water shadows a bit to make them softer and less obvious.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2735 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 21:40:47 +00:00
Giel van Schijndel 08c7de7a8c * Don't add/remove droids to/from groups upon selecting/deselecting them
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2734 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 21:38:24 +00:00
Per Inge Mathisen 670512cde8 Clear out some old cruft from the radar code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2733 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 21:22:25 +00:00
Giel van Schijndel ae6b39d5dc * Prevent a segfault when running on Windows;
* Make sure to initialize PhysicsFS __before__ calling PHYSFS_getBaseDir() 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2732 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 20:41:28 +00:00
Giel van Schijndel 854c5eba1c * In revision information extraction class RevSVNVersionQuery (uses "svnversion"), ignore its output if the word "exported" is encountered (that way compiling from an exported working copy is possible also)
* Parse the "/autorevision.conf" file as last
 * Add template class assign_once<T> which wraps a T object so that it can only be assigned to once (all following assignments will simply be NO-OPS)
 * Make all RevisionInformation members an assign_once<T> object instead of a T object
 * Make sure src/version.c can compile when there is little revision information available
 * Add autorevision.conf which will provide a sane default for wc_uri ("trunk")


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2731 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 18:43:30 +00:00
Giel van Schijndel 7bb4fedb98 * Don't strip binaries when building Debian packages
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2730 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 17:29:11 +00:00
Giel van Schijndel 043fc0ba63 * Call PHYSFS_init() in initialize_PhysicsFS() instead of before calling PHYSFS_init() before calling initialize_PhysicsFS()
* Initialize the NLS system __before__ parsing command line arguments; that way the output of some command line args can be translated as well (e.g. --version, --help, etc.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2729 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 17:24:11 +00:00
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