Commit Graph

2095 Commits (34e4246bd4936ffc04bd1975670093e1c9aefd37)

Author SHA1 Message Date
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
Per Inge Mathisen eb01bc2b64 patch #1064: Multi-threaded path-finding, this merges in the path-finding branch.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5735 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 14:37:53 +00:00
Per Inge Mathisen f6bf526248 Mostly cosmetic cleanup of naybor functions. Inline a macro that is only used once,
and break out of loop as soon as possible.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5734 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 12:32:30 +00:00
Buginator 6ccaa10f16 Enhances 'map preview' screen with map maker's ordering of the players position.
This allows players to get to the correct starting position on the map they picked, much easier.

Note, this uses a FBO.  If your card doesn't support it, then you will basically notice nothing different.  A fallback routine is done (but not in this patch), it is just waiting for a decent font *bitmap* that we can use.

Please see http://forums.wz2100.net/viewtopic.php?f=19&t=1953 for more discussion on the matter.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5733 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 04:28:58 +00:00
Giel van Schijndel 1f0410aeb5 * Slight refactoring of viewDataShutDown to reduce nesting
* Make the linked list manipulation actually ''work''

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5711 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 21:20:44 +00:00
Giel van Schijndel 164b02f4f0 Get rid of the `numFrames' fields that are only used by PSX code (it's only read in, but not used anywhere)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5710 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 21:20:31 +00:00
Giel van Schijndel 4ddff7023c Explicitly cast away constness in the script gettext functions
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5706 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 11:26:13 +00:00
Giel van Schijndel b5bfd1d8eb Win32 raw Makefile system:
* Compile message_parser.y ''before'' message_lexer.l and message.c, so that message_parser.tab.h is already generated when the former two start compiling

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5705 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 11:25:31 +00:00
Giel van Schijndel 763bc7bbd8 Add a new parser: message_parser which parses research message data in a significantly different format from the current CSV message format as "parsed" by loadViewData (this allows for easier gettext translation)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5695 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 21:01:05 +00:00
Giel van Schijndel 8eaf3bfa8b * Move constant MAX_DATA to messagedef.h
* Use strdup() instead of malloc() + strcpy()
 * Remove unused enmurant VIEW_TYPES

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5694 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 20:53:54 +00:00
Per Inge Mathisen 7f768ba83e Add naval propulsion, appropriating the unused 'Propellor'
propulsion for this purpose. To test, use 'give all' cheat
before design, and the ctrl+o menu to place.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5691 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 09:15:20 +00:00
Giel van Schijndel f7a433bf51 Add these gettext "macros" to the scripting engine: N_, P_, PE_, NP_, gettext_noop and pgettext, which work just like their C counterparts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5689 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:12:59 +00:00
Giel van Schijndel 121a3fad11 * Add '_' and 'gettext' function, for gettext translation, to the script engine
* Include all *.slo files when parsing for translatable strings with xgettext

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5686 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:12:12 +00:00
Giel van Schijndel 3eabf084ad Get rid of the ID number cruft in the string resource system:
* At the only place where these ID numbers where used (scrValDefSave and scrValDefLoad), use the key-string instead (e.g. "ZNULLBODY" instead of 17)
 * Rename function strresGetStringByID to strresGetString
 * Increment event save file version to 4 (version of savegame.es files)
 * Reject loading of savegames that need to load non-NULL ST_TEXTSTRING variables from version < 4

NOTE: This may break current savegames of games that use scripts with variables of type TEXTSTRING in them (AFAIK currently only ''some'' campaign and tutorial savegames have these).

This closes ticket:19

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5685 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-27 23:58:49 +00:00
Giel van Schijndel 54ae7cda3a Remove useless wrapper function scrvGetString, which does nothing more than to forward its call to strresGetStringByID
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5684 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-27 23:51:56 +00:00
Per Inge Mathisen 599923b4a4 Remove unused code and fix some indentation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5683 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-27 20:13:41 +00:00
Per Inge Mathisen 0582c22c94 Allow the placement of droids from ctrl+o cheat menu on water when
they can drive on it. Also move a variable into more local scope.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5682 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-27 19:57:56 +00:00
Giel van Schijndel 45dc51512b * Add a new function transporterIsEmpty to determine whether a transporter holds no droids
* Allow sending of transporter droids when they're empty

Addresses ticket:5

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5681 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-27 13:38:17 +00:00
Giel van Schijndel 5f496b5b33 Allow (warning-less) compilation with Flex 2.5.33
Patch #1089 by Bertrand Coconnier <bcoconni>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5679 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-27 13:34:58 +00:00
Giel van Schijndel 72d29fc343 Make function isDead const correct
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5677 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 21:48:02 +00:00
Giel van Schijndel 77b16be151 Fix a typo introduced in r5665
Patch by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5672 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 17:12:58 +00:00
Roman C 35ed66a847 Restore the true Heightmap radar mode: ignore terrain type. The difference between the current one and 2 terrain radar modes is almost non-existent.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5670 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 11:42:37 +00:00
Giel van Schijndel 0340c2d9c3 Make it possible for the ST_GROUP loading code in function scrValDefLoad to accept higher savegame event data versions than 3
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5668 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 00:55:23 +00:00
Giel van Schijndel b40e7a6a90 Further hardcode the treap management code to the string resource system:
* Don't maintain a secondary linked list of strings in strres.c
 * Add the string that's tracked and it's ID number to the TREAP_NODE structure
 * Let the treap code manage its own memory
 * Have the treap code perform reverse lookups using either the resource string (i.e. not the "key" string) or associated ID number

NOTE: Searching a treap for anything else than the key is O(n), but that's no worse than a linked list, which is O(n) as well. Walking a treap has O(log n) as memory requirement, whereas walking a linked list has O(1) as memory requirement (stack size). So the only disadvantage is that searching the treap has a (highly remote!) possibility of stack overflows.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5666 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-25 20:27:54 +00:00
Giel van Schijndel dda033b53e Small refactoring and indentation fix to increase readability of gridIntersect
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5665 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-25 16:23:09 +00:00
Giel van Schijndel 88f428e37d * Make gridObjRange const correct
* Move commented out code into an #if 0 section (instead of /**/ comment)
 * Use function world_coord instead of manual multiplication by TILE_UNITS
 * Use the MAX macro to get the largest of two values (instead of manual comparison and selection of values)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5664 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-25 16:10:20 +00:00