Commit Graph

3358 Commits (57afe597824e34cdce3031f35e9de86ef144bd71)

Author SHA1 Message Date
Dennis Schridde 57afe59782 Use the unique, untranslated pName to identify templates, not anything else. (This would create trouble with translations.) Fixes bug #11345.
Cleanup loadDroidTemplates and loadDroidWeapons.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4238 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 13:17:30 +00:00
Giel van Schijndel 6aa9b6fa35 * Declare static string constants as `static const char string[]` rather than `char* string` (guarantees both constness and that we won't accidentily change the pointer)
* In NETcoder declare string str the same size as original (using sizeof), use sizeof() instead of magic numbers


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4237 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 13:12:58 +00:00
Giel van Schijndel e18a6100f7 Backport r4235 from the 2.1 branch into trunk:
Strip the Debian package of symbols and put the symbols in a separate package: warzone2100-dbg


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4236 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 12:19:28 +00:00
Dennis Schridde 39f34056a9 Import from __future__ has to be first in file. Additionaly let the lobby tester connect to lobby.wz2100.net
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 00:33:16 +00:00
Dennis Schridde 2ba55d14a8 Record the time of compilation, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4233 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 00:05:41 +00:00
Dennis Schridde 02f3422fb3 Remove linebreak as it messes up formating for some reason.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4232 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 23:55:24 +00:00
Dennis Schridde 6e89ffe22b Forgot to include physfs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4231 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 19:11:29 +00:00
Per Inge Mathisen 6185741b66 patch #1018: Experimental language selection menu option.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4230 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 18:30:08 +00:00
Roman C 3b1c952de1 Speed up script execution when "--debug script" is not enabled.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4228 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 17:42:07 +00:00
Roman C a4ecc477be Speed up a scripting function.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4226 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 17:30:57 +00:00
Roman C 8478728699 Get rid of an unnecessary debug() call.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4225 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 17:23:28 +00:00
Dennis Schridde 758270e3c6 Copy translations from branches/2.1 and update-po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4224 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-22 00:35:12 +00:00
Giel van Schijndel 57389641e7 Remove the last content of deliverance.h (#define MAX_STR_LENGTH 256) to wzglobal.h and remove it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4219 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 23:02:22 +00:00
Giel van Schijndel e9d0c77347 Get rid of macro constant MAX_NAME_SIZE
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4218 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 22:49:01 +00:00
Giel van Schijndel 204f827bf7 Get rid of macro constant MAX_STR_SIZE
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4217 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 22:17:56 +00:00
Giel van Schijndel d3588bc4ad make printBaseObjInfo, printComponentInfo and printWeaponInfo static functions
* const correctness


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4214 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 21:37:26 +00:00
Giel van Schijndel 4d65c133b1 const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4213 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 21:37:21 +00:00
Giel van Schijndel 12f8bbbb31 Clean out unused trash from resource.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4212 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 21:37:15 +00:00
Giel van Schijndel 7f09ef6a28 get rid of an unnecessary goto-statement
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4211 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 21:37:09 +00:00
Giel van Schijndel 0e522201e0 Cleanup:
* Turn some file-level comments into Doxygen comments
 * Add #include guards to some headers that didn't have them yet


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4210 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 21:37:01 +00:00
Giel van Schijndel 8138e1b0d8 Turn some file-level comments in lib/widgets into Doxygen comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4209 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 21:36:39 +00:00
Per Inge Mathisen a622880946 Increase warning level and do cosmetic cleanup and remove dead code in events.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4208 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 16:52:10 +00:00
Dennis Schridde 9ca4445189 We always only have either config.h or config-macosx.h, but not both.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4207 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 16:38:57 +00:00
Giel van Schijndel 8421b9fee4 Turn some file-level comments in lib/widgets into Doxygen comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4206 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 15:40:23 +00:00
Giel van Schijndel de2b3ba61d Move psRetWidget into the W_SCREEN structure (instead of it being a global variable)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4205 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 15:40:09 +00:00
Dennis Schridde b1b2859ea3 New enum TEXPAGE_TYPE, to better control disabling/enabling of texturing. (Changed pie_SetTexturePage accordingly.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4202 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:34:30 +00:00
Giel van Schijndel 9895df559d Make widgCreateScreen return the screen it created or NULL on failure
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4200 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:42 +00:00
Giel van Schijndel 3ed3acd891 Clean up formCreate and widgAddForm:
* Make formCreate and widgAddForm take their psInit parameters as const
 * Make formCreate return the button it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4199 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:36 +00:00
Giel van Schijndel 86ca2b5f06 Clean up editBoxCreate and widgAddEditBox:
* Make editBoxCreate and widgAddEditBox take their psInit parameters as const
 * Make editBoxCreate return the button it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4198 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:30 +00:00
Giel van Schijndel 6ea7968f46 Clean up labelCreate and widgAddLabel:
* Make labelCreate and widgAddLabel take their psInit parameters as const
 * Make labelCreate return the button it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4197 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:20 +00:00
Giel van Schijndel 7e6e7d8b1f Clean up buttonCreate and widgAddButton:
* Make buttonCreate and widgAddButton take their psInit parameters as const
 * Make buttonCreate return the button it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4196 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:15 +00:00
Giel van Schijndel a4987cfefb Clean up barGraphCreate and widgAddBarGraph:
* Make barGraphCreate and widgAddBarGraph take their psInit parameters as const
 * Make barGraphCreate return the bar it created or NULL on failure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4195 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:22:05 +00:00
Giel van Schijndel cd8365fb01 Cleanup of widgRunScreen
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4194 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:21:53 +00:00
Giel van Schijndel 20448076bf Revert part of r4184:
* Don't use abort() as it'll be triggered in non-debug builds as well, so stick with the ASSERT(FALSE, ...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4192 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 13:23:35 +00:00
Giel van Schijndel d5e31eb751 Make sliderCreate return a pointer to its created slider and NULL on failure
Const correctness:
 * make sliderCreate and widgAddSlider take its psInit pointers as const


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4185 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 11:47:23 +00:00
Giel van Schijndel dd02289a5e Clean up sliderCreate and widgAddSlider
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4184 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 11:47:19 +00:00
Giel van Schijndel 95d8cddc61 remove data/mods/global/aivolution/installation.txt from the raw makefiles and autotools buildsystem (to complement r4156)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4181 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 19:34:09 +00:00
Roman C 827cd6e350 Cosmetic changes: fixed some whitespaces.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4179 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 18:48:18 +00:00
Roman C dabd096fd5 Buginator is concerned about my commit log record, so..:
A better fix to the ctrl-o menu bug: don't check for NULL in two different places.

Patch by Buginator.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4177 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 18:42:19 +00:00
Roman C 279230ca8c Add some additional checks to unit production functions.
Patch by Buginator.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4175 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 18:29:16 +00:00
Roman C 04cf4c0260 Fix ctrl-o menu crash. Patch by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4173 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 18:17:00 +00:00
Giel van Schijndel 32b5a38e53 * Remove function addSlideOptions which only forwarded its function call to _addSlideOptions
* Rename _addSlideOptions to addSlideOptions


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4172 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 16:35:26 +00:00
Per Inge Mathisen ab69397e08 Parts of patch #730: movement patch by Watermelon, with changes by me, to clean
up path finding distance calculation.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4171 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 16:03:58 +00:00
Per Inge Mathisen 798e1aed22 Lower default terrain texture size to 64 to be nicer to people with worse hardware.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4170 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 16:01:28 +00:00
Per Inge Mathisen f6743c23d2 Add hack to prevent droids from being stuck because path-finding does not
understand that very steep slopes cannot be crossed, and these slopes were 
not properly marked as cliffs in the map. Now droids can climb even the
steepest slope if not marked impassable, although slowly. This is the lesser 
evil (compared to getting stuck droids), since stuck AI droids will clog up 
path-finding for everyone.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4167 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 15:50:28 +00:00
Roman C e3130c9c96 Aivolution: fixed swapped actual parameters for the first and second parameter of a function.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4166 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 15:44:14 +00:00
Per Inge Mathisen fe2ff84ed3 Fix bug #11216: When a tooltip is shown, the sky vanishes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4164 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 14:59:33 +00:00
Per Inge Mathisen 74cf21ef6d Patch #980 by Buginator: Remove some faster/slower options when not
in debug mode to prevent various bugs that may appear in them.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4162 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 14:32:10 +00:00
Per Inge Mathisen 9a57ec77f6 Add new debug command to display droid paths for selected droids on the map.
The default key combo is LCTRL + m. You need to delete your keymap file again.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4161 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 13:40:34 +00:00
Roman C d334213174 Aivolution:
wait some time before notifying allies of an idle state to prevent too rapid state changes

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4160 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 01:11:58 +00:00