Commit Graph

4598 Commits (eb01bc2b648009bd59fea61b9a4dcd94bd35b6cd)

Author SHA1 Message Date
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
Buginator 1578d9ade8 *no code changes* Just adding a note to some functions that can use the master server to transfer the data to/from.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5732 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 03:58:26 +00:00
Freddie Witherden 977bc5e327 Add support for showing and hiding widgets; update how events are handled when a widget is hidden or disabled.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5731 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 21:24:19 +00:00
Dennis Schridde 79c1569a08 Add correctly broken (Word 2000, hope that is correct) ScriptingManual.htm
Keep xhtml11 variant for now, as Kreuvf is not yet sure whether he wants to maintain it or not.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5730 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 19:25:57 +00:00
Freddie Witherden f7f5d309a7 Move the glTranslatef calls in the widgetCompositeImpl function to outside of the for loop,
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5729 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 18:55:42 +00:00
Buginator 2df15ab5c6 Fixes endian issue with master server code.
We always want the structure packed to be 'network byte order' (big-endian).

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5728 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 18:11:00 +00:00
Freddie Witherden 2c20b8e0e7 Fix a minor indentation issue in widget.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5727 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 17:51:07 +00:00
Dennis Schridde 87f127c146 Do not autogenerate aivolution scripts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5726 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 17:39:10 +00:00
Dennis Schridde dc2e44e9b0 Fix an instance of "WRP"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5725 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 17:33:55 +00:00
Steven Koenig 811d744d15 ScriptingManual.xhtml:
* Script functions, Debugging script functions, Script function constants, Script function externals and Script function callbacks are appendices now
* Sorted most script functions and add headings for them
* still to come: possible new CSS, appendix C and D, footer


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5724 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 14:38:39 +00:00
Freddie Witherden b45fad3ee0 Update the documentation for vector.h and fix a bug in vector.c.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5723 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 12:02:18 +00:00
Freddie Witherden 415f4555dc Remove some empty doc-blocks from betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5722 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 11:31:12 +00:00
Freddie Witherden b854f5bcb0 Remove some dodgy forward declarations from betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5721 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 09:15:43 +00:00
Freddie Witherden 7aef59ad0d Allow Betawidget to compile under OS X (OpenGL header location is different).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5720 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-31 19:30:36 +00:00
Freddie Witherden 30b0cfac27 Update the documentation for vectorCreate.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5719 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-31 18:39:59 +00:00
Steven Koenig f0366a49ad ScriptingManual.xhtml:
* Using CSS files of the readme for now, may be changed in later commits
* Markup for 10/11 parts complete
* Markup for the last one will take a while (~25 to 30 DIN A4 pages)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5718 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-31 11:29:45 +00:00
Giel van Schijndel b2e83cabc1 Add some ASSERTs to check for dodgy pointers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5715 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-30 20:42:02 +00:00
Steven Koenig f01068730d * Cleaned ScriptingManual.xhtml by hand and with HTMLTidy which reduced the file-size by more than 50%
* Markup will be restructured in later commits
* Deleted the contents of scriptingmanual.css; will decide later if the file is needed or not


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5714 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-30 15:59:08 +00:00
Giel van Schijndel 11cd7ac69f Fix the MSVC project for compiling lib/exceptionhandler
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5712 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 21:27:17 +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
Steven Koenig c53386d59c Updated de.po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5709 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 18:57:27 +00:00
Giel van Schijndel 068d2d3174 Move the last translatable string that's used by the scripts into the scripts themselves: _("Return to LZ")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5708 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 18:28:40 +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 22e9053a8c Update the Xcode project for r5695
Patch by Tim Baumgartner

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5704 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 10:34:23 +00:00
Giel van Schijndel 3d1c469ac8 * Update POTFILES.in: include the *.rmsg files in xgettext's parsing run
* make -C po update-po


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5703 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 00:32:47 +00:00
Giel van Schijndel e48619f9eb Convert data/base/messages/resmessagesall.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5702 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 00:26:41 +00:00
Giel van Schijndel 1c22e4e314 I forgot to commit the changes to data/mp/messages/resmessagesall.rmsg in r5700
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5701 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 00:15:33 +00:00
Giel van Schijndel a2a08db52e Convert data/mp/messages/resmessagesall.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5700 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 00:12:07 +00:00
Giel van Schijndel b122c5a07c Convert resmessages1.txt and resmessages3.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5699 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 23:48:49 +00:00
Giel van Schijndel aaf666d026 Convert resmessages2.txt and resmessages23.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5698 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 23:27:15 +00:00
Giel van Schijndel e5ca53e2ec Convert resmessages12.txt and messages.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5697 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 22:49:28 +00:00
Giel van Schijndel 090c069f5e Remove data/mp/messages/multiplay.txt as it's ''exactly'' the same as data/base/messages/multiplay.txt (and base depends on this one as well)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5696 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 21:47:45 +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
Giel van Schijndel 231866a510 Allow compiling with Flex < 2.5.9, r5679 and patch #1089 broke this
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5692 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 13:34:00 +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 49944c6e3b * Remove several unused strings
* Move some strings to scripts

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5690 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:46:36 +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 40a8a0c1ff Remove several unused strings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5688 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:12:52 +00:00
Giel van Schijndel 8175833f5b * Move all translatable strings used by the tutorial into the tutorial's script file and out of the string resource file (`tutstrings.txt`)
* make -C po update-po

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5687 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:12:42 +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