Commit Graph

2120 Commits (75d615d1344a5904d06fbd42cd5a957b0351256d)

Author SHA1 Message Date
Buginator 420fbeca2d Phase 1 for the multiplayer scoreboard enhancements.
Color codes entries based on friend/foe colors.
(Your always white, team players = yellow, enemy = red, dead = gray.)

We also show unit count for your player, and structure count (on skirmish games) which is replaced by 'ping' on MP games.

Follow up thread about next phase is here:
http://developer.wz2100.net/ticket/12


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5974 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-09 04:13:09 +00:00
Giel van Schijndel 1eefcb27c9 In r5961 the prototype for resetRadarRedraw() got removed causing compilation problems: fixed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5967 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 00:16:15 +00:00
Per Inge Mathisen e26af6f48b Improve doxygen documentation for path and minimap subsystems.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5961 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 21:44:06 +00:00
Buginator 21fdab0117 Modify debug output to specify the 'real' directory that physfs is using for the file in question.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5958 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 20:00:54 +00:00
Per Inge Mathisen 789c2f0502 patch #1102: Effects cleanup, part 1.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5947 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 09:34:18 +00:00
Buginator 3d866e1a8c Just moving the menu up to make it look a bit better.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5945 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 20:44:30 +00:00
Freddie Witherden d7d9e3286c Fix bug #12268 which caused abandoned factory modules to result in destruction of the entire factory.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5928 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-05 16:30:46 +00:00
Per Inge Mathisen eedb9a9c98 Cosmetic fix: Make EffectGetNumFrames static.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5923 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-03 16:22:24 +00:00
Buginator c8beeaff83 Updating menu layout to a more logical order.
Closes bug #11801 & ticket #41

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5888 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-29 17:06:13 +00:00
Giel van Schijndel 37c6aa9fd6 Make sure to clean up the sound streams as well in function sound_ShutdownLibrary()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5884 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-28 20:12:47 +00:00
Per Inge Mathisen ceb4e23eda patch #1096: Improve speed of fireOnLocation, and use it to fix AI bug
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5883 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-28 19:55:09 +00:00
Giel van Schijndel 99605c5982 Don't use a forward declaration to declare pointers to BASE_OBJECT as that somehow goes wrong (I'm guessing related to WZ_DECL_MAY_ALIAS), instead #include basedef.h in baseobject.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-28 19:26:06 +00:00
Ari Johnson d5b341334d More changes from #ifdef __APPLE__ to #if defined(WZ_OS_MAC)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5880 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-27 15:24:21 +00:00
Giel van Schijndel 5bc5e1a873 Replace #ifdef __APPLE__ (from r5878) with #if defined(WZ_OS_MAC)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5879 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-27 14:21:39 +00:00
Tim Baumgartner c6ddf919c1 This commit fixes OS X build errors.
-Fixed Xcode project Release configuration framework and library search paths to point to their respective Release directories (rather than to the Debug directories)
-Added baseobject.h and baseobject.c to the Xcode project file
-Added preprocessor conditional to multiint.c so that the proper GLC header is included on OS X systems


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5878 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-27 07:25:48 +00:00
Freddie Witherden 55be99a19d Add sync-to-vblank support to Warzone; this closes ticket #38.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5871 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-25 18:01:49 +00:00
Giel van Schijndel fd0084951e Prevent some infinite recursion
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5867 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-24 16:13:20 +00:00
Giel van Schijndel 360dc86ef4 * Make CHECK_OBJECT, CHECK_PROJECTILE and CHECK_STRUCTURE macros that redirect to a function
* Add two new files: src/baseobject.[ch]
 * Have CHECK_OBJECT call any of CHECK_DROID, CHECK_PROJECTILE or CHECK_STRUCTURE depending on the object's type
 * Change CHECK_DROID and checkDroid to use the AT_MACRO to get the current filename and line number
 * Change checkDroid to use ASSERT_HELPER to provide the source of the assertion

NOTE: The autotools, Code::Blocks, win32 Makefiles and MSVC buildsystems are updated, Xcode will still require an update

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5866 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-24 15:56:00 +00:00
Giel van Schijndel 173ee31214 * Split ASSERT out into ASSERT_HELPER:
* ASSERT_HELPER can be used by debug functions that wish to alter the location information attached and printed with ASSERTs
 * Add some missing semi-colons (the previous ASSERT macro had a terminating semi-colon)
 * Change an ASSERT that checks calloc's return value into an if() block (we can also run out of memory on non-debug builds...)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5865 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-24 15:42:59 +00:00
Giel van Schijndel 213070da95 Make function packageCheck const correct
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5863 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-24 14:29:14 +00:00
Giel van Schijndel 50519cff38 * Add some Doxygen comments
* Improve some comments
 * Separate parameters with both a comma and a space, i.e.: ", "
 * Make ForceDroidSync take its psDroid parameter const
 * Add some whitespace to enhance readability (as readability is a very important part of maintainability)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5862 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-24 13:42:17 +00:00
Giel van Schijndel f957004f2c * Improve some comments
* Fix some typos
 * Separate parameters with both a comma and a space, i.e.: ", "
 * Turn a debug(LOG_ERROR for a condition that should never happen into an ASSERT


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5861 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-24 12:41:59 +00:00
Buginator 0ab4d2b32c Fixes r5507 (trunk) & r5568 (branch) and closes bug # 12219 , and report of same bug in forms.
Issue was, orders were not given to pre positioned droid units.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5849 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-23 18:35:59 +00:00
Buginator 81395a05b3 Prevents a division by 0 error reported in the forums.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5842 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-21 03:16:31 +00:00
Per Inge Mathisen cf7c584399 patch #1095: Make font configurable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5841 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-20 21:23:58 +00:00
Buginator e8f4edbb56 Fixes bug #12053
After a SP game has ended, needed to reset the search path back to mod_multiplay. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5839 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-19 05:07:06 +00:00
Buginator 807549b8e2 Fixes bug #12116
Cyborg transports now can load/unload correctly.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5838 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-18 03:28:03 +00:00
Per Inge Mathisen 1f806cbb2e Add ugly workaround for buggy maps created by the map editor, where the number of terrain
are apparently larger than the maximum. Reported by gronlund on IRC.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5836 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-17 20:51:57 +00:00
Buginator ebecb854b1 Add a fallback for the map preview when drivers report they have FBO, but we detect a FBO error.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5835 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-17 18:35:22 +00:00
Buginator eaffd089b3 Added visual feedback for when there are no games available in the lobby, we notify the user of that fact.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5833 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-17 18:18:31 +00:00
Per Inge Mathisen 30af74e59d Mostly cosmetic cleanup of action update code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5823 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 21:48:58 +00:00
Per Inge Mathisen 4cfdec7d58 Remove some dead code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5822 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 20:40:38 +00:00
Giel van Schijndel 1e2717ee8f Add a line break ('\') in src/Makefile.am which got removed in r5696
This closes ticket:29 patch by <skellr>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5793 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-11 10:45:28 +00:00
Per Inge Mathisen 35b32a31db Fix bug #12121: Map: Highway broken with 2.1. Be more lenient with broken maps, since we do not
have a map editor that we can fix: If the next feature in the map overlaps another, remove the 
already placed feature in favour of the new one.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5782 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 16:02:22 +00:00
Per Inge Mathisen 6f89f25b80 Attempt fix for bug #12118: Could not find string for ID. Has high risk for creating
more asserts - please report them to me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5781 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 15:40:21 +00:00
Per Inge Mathisen e4a968fb74 Fix problem introduced in previous bugfix to paths, which made us create non-optimal paths for single
tile obstructions that are also valid targets, such as oil derricks.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5776 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 19:11:24 +00:00
Per Inge Mathisen c227811cc6 Fix upgrading 3x3 size buildings. Fix in r5766 was wrong, sorry. Thanks to nexz for a patch
suggesting a possible solution, although I wrote my own.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5775 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 18:32:41 +00:00
Buginator a5f4f862d1 Fix crash when cyborg transport dies with selection window still open.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5773 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 04:55:39 +00:00
Giel van Schijndel ced8a64ad1 Revert r5768 which got committed accidentily
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5772 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 23:09:33 +00:00
Giel van Schijndel 83159f335d Coding style:
* Fix indentation
 * Don't repeat function prototypes in their pre-leading comments
 * "Upgrade" some function comments to Doxygen comments
 * Remove whitespace from the end of lines
 * Reintroduce empty lines removed in r5733

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5769 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 21:06:39 +00:00
Giel van Schijndel d54e360aa7 Add some code to hook into Mumble's Link plugin and provide Mumble with positional information about the player's current viewing position in Warzone
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5768 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 20:53:14 +00:00
Per Inge Mathisen af224be8bc When iterating over neighbouring start tiles for a path, do not iterate from the end
position of the path. Fixes bug in new multi-threaded path finding code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5766 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 20:04:29 +00:00
Buginator 38c54928d3 Delete the FBO (if we are using it) when done with it, and also fix a whitespace issue. :S
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5765 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 19:36:02 +00:00
Buginator 1375e432b7 Should finally fix the smoking droid issue.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5764 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 17:52:03 +00:00
Giel van Schijndel a293a90e76 * Rename audio_Get3DPlayerPos to audio_GetPlayerPos and change it to return a Vector3f instead
* Rename audio_Get3DPlayerRotAboutVerticalAxis to audio_GetPlayerOrientation and change it to return two Vector3f's with a forward and upward pointing vector in it (which can be directly used by OpenAL)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5763 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 17:51:43 +00:00
Giel van Schijndel 4c19888cba * Move the fixed point cruft used for representation of degrees and some matrix math into a seperate header: piefixedpoint.h
* Update the autotools, win32 makefiles, Code::Blocks and MSVC build systems

NOTE: Xcode will need an update for this


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5761 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 16:04:41 +00:00
Per Inge Mathisen dc9eb02c34 Improve logging from assert when number of context variables don't match.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5751 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 21:08:50 +00:00
Per Inge Mathisen 1d9b5af07c Remove dead code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5743 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 16:32:48 +00:00
Per Inge Mathisen 496d5d0ad8 Remove unused code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5742 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 16:14:59 +00:00
Per Inge Mathisen b974fe2e01 Try to fix bug #12083: radar's frustum is drawn incorrectly, by making sure different parts
of the code agree on exactly where the radar beings and ends. Please verify if this fixes the bug.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5738 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 15:17:22 +00:00