Commit Graph

882 Commits (39b4a1da37f3370a395d96851d718106aa4a7332)

Author SHA1 Message Date
Gerard Krol 39b4a1da37 Remove a some "temporary" checks from defenseLocation that were causing asserts. The AI doesn't seem to care, and happily builds defenses.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1352 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 15:36:25 +00:00
Gerard Krol aadc399453 The function asciiKeyCodeToTable from keymap.c was returning invalid table indices.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1351 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 14:55:28 +00:00
Dennis Schridde b2ca1a6825 Autopoint removal by Per.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1350 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 14:04:21 +00:00
Gerard Krol 7f73a0b730 Remove a debug statement that I left behind.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1349 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 13:35:57 +00:00
Giel van Schijndel 26f2672bfd * remove macro PTRVALID
* replace all instances of PTRVALID(ptr,size) by (ptr != NULL)
 * remove asserts of style ASSERT( x == NULL || x != NULL ) because they would evaluate to true always anyhow and as such wouldn't ever trigger
 * remove macros iV_HeapAlloc and iV_HeapFree and replaced them with MALLOC and FREE respectively (that's what they expanded to anyway)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1348 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 13:20:41 +00:00
Gerard Krol 021b489038 Fix the E3 demo, which crashed by selecting a negative player number to follow a droid for.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1347 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 12:58:00 +00:00
Stefan Huehner 0e396d1f6a fix the build.
Remove the block.c and mem.c lines from POTFILEs.in as
well, as these files where removed completely.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1346 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 11:51:51 +00:00
Giel van Schijndel 13c85370b9 * enable libvorbisfile to seek into a file opened with PhysicsFS
* also allow this to be disabled on a per file basis (this code is basically taken from the sound branch: lib/sound/decoding.cpp)
 * some minor code cleanups (using a temporary to cast into, rather than casting directly into a function call's parameters, optimizer will optimize this away anyhow)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1345 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 11:15:41 +00:00
Gerard Krol 50effcd212 Fixes an assert when loading a map preview. (gateways were being calculated without the terrain types correctly set up)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1344 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 11:12:00 +00:00
Gerard Krol 42ed587327 Per's removal of the memory heap system. Now MALLOC is just malloc, and not some wrapper around a wrapper that will allocate it from a specific pool.
The MSVC poject will need to be updated I guess, as some files were deleted.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1343 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 10:33:26 +00:00
Giel van Schijndel fe90b5374a * apply patch found in bug #6953 by David Brettle
NOTE: this does not fix the issue of the close button not flashing, it does however make this script request it to be flashed (as in, one down, on to go).

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1342 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 23:27:57 +00:00
Giel van Schijndel a61dcf5a50 * set mime-types on data:
*.ogg -> application/ogg
  *.jpg -> image/jpeg
  *.png -> image/png
  *.svg -> text/xml

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1341 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 22:39:14 +00:00
Giel van Schijndel 2465969014 * allow viewing in any browser directly from the svn-http url ( http://svn.gna.org/svn/warzone/trunk/data/multiplay/skirmish/scriptlang.htm )
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1340 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 21:49:03 +00:00
Dennis Schridde 07f6c04ecd Sensor targeting fix by Thomas Rast
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1339 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 20:51:08 +00:00
Giel van Schijndel 0730665b1e fix raw makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1338 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 20:49:14 +00:00
Dennis Schridde ea74165cec A little bit more strings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1337 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 20:09:11 +00:00
Dennis Schridde 3867e71196 Very basic german translation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1336 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 18:58:28 +00:00
Per Inge Mathisen 2f6baa8b8a Check separately for gettext, and give hopefully informative message when
only autopoint is missing. Also run autopoint with --force option to avoid
stupid errors.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1335 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 18:30:04 +00:00
Dennis Schridde f2eb836b61 - Remove unnecessary files in m4
- Fix autopoint detection in autogen.sh
- Require only gettext 0.14 in configure.ac


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1334 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 18:08:23 +00:00
Dennis Schridde 874f421a25 Add autopoint, autoconf and automake checks back in...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1333 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 17:48:14 +00:00
Dennis Schridde 3b09a756df - Remove unneeded gettext files and instead create them via autopoint
- Remove unneeded checks from autogen.sh (all of them are also checked in configure.ac)
- Move AM_CPPFLAGS=-$(top_srcdir), which was included in nearly every Makefile, to configure.ac
- Remove -g from CFLAGS for usual builds. This should be set by the buildscripts instead
- Remove CFLAGS_OVERRIDE, which was rendered obsolete by the above change


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1332 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 17:21:05 +00:00
Gerard Krol 71b4cb283b Bugfix: Can now properly save the game when sound is disabled. (this caused an assert)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1331 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 15:21:30 +00:00
Dennis Schridde bd9eda5a69 Makevars had double content
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1330 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 15:00:10 +00:00
Dennis Schridde f2b9e42484 Make NSIS uninstaller delete ChangeLog and Authors files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1329 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 13:18:38 +00:00
Dennis Schridde 0aa7cd1b8c Comply with the gettext manual and move path fallbacks to the common location
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1328 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 21:15:07 +00:00
Per Inge Mathisen 6f32003a02 Start removing unused droid program component code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1327 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 21:01:29 +00:00
Per Inge Mathisen f87e320bca Add partial Norwegian translation. To test, make sure you do a "make install"
and use "export LANG=nb_NO" before running Warzone.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1326 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 20:17:06 +00:00
Per Inge Mathisen c232641119 Copy strings back into the C code, and make them translatable by gettext.
Thanks to Huehner for writing the script that transformed calls to strres
back into C strings.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1325 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 20:15:46 +00:00
Per Inge Mathisen 0de1ff1124 Fix warning
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1324 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 20:12:47 +00:00
Per Inge Mathisen 69dd9fbdc5 Add autogen.sh checks for gettext, and assign the _() macro to gettext.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1323 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 20:09:46 +00:00
Roman C 8e0c0f397c Fixed naming inconsistency.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1322 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 18:51:48 +00:00
Dennis Schridde 7aa777d056 scrBitSet -> scrGetBit
The name was confusing


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1321 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 18:22:33 +00:00
Per Inge Mathisen a1d02fec76 Prune some dead code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1320 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 18:22:27 +00:00
Roman C 3123e32370 Skirmish AI:
-AI chat messages are now visible to all allies, not only to the player messages are addressed to
-upon help request AI will notify if it doesn't have enough units to come to help instead of silently ignoring the request

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1319 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 16:25:59 +00:00
Roman C 89f67fc187 Scripting Engine:
-fixed local string variables now being cleared between function calls
-implemented a setBit() scripting function to work with bitfields

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1318 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 16:22:01 +00:00
Dennis Schridde dcd8aa2eed Port of r1315 (HKLM and updater)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1316 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 00:19:03 +00:00
Dennis Schridde 6180aab09d - Make make visit intl/
- Update dbghelp.h to Wine 0.9.34
- Sync with branches/2.0


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1313 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-31 18:04:43 +00:00
Roman C 1c2ec5e07d Enabled recursive function calls for scripts.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1311 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-31 16:03:21 +00:00
Dennis Schridde c5e611767b Gettext support (0.16.1 included)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1310 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-31 15:34:35 +00:00
Roman C fbb361f5a7 Forgot in my last commit - ChangeLog again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1309 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-31 15:27:40 +00:00
Roman C 7c7079c469 Updated ChangeLog.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1307 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-31 15:19:38 +00:00
Gerard Krol d775cc8962 r1302 caused smoke to be nontransparent when viewed in front of the sky or fogbox. This is fixed by first drawing the sky and fogboxes and then
the terrain and other objects. (it was the other way around)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1304 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-30 19:41:44 +00:00
Gerard Krol bbd1fc594f Fix a bug introduced in r1302: Unit selection boxes were not shown or periodically disappeared.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1303 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-30 18:12:56 +00:00
Gerard Krol 290fb5ebe2 A speed up for people who are fillrate limited: 1. The stencil buffer is no longer cleared each frame when shadows are disabled. 2. The color buffer
is no longer cleared each frame, but care is taken do draw on the entire screen so that no smearing takes place. This patch gives me about +30 fps. 
(from 45 to 75)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1302 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-30 17:38:35 +00:00
Roman C bfa9d23e01 Skirmish AI Update:
-a much faster unit production due to raised production effectiveness
-optimized construction of structure upgrades (smarter construction routines)
-AI trucks are capturing unoccupied oil resources more effectively
-slightly improved target selection when going to attack stuff
-rewrote routines responsible for helping allies that request help
-"I'm ok" command now works properly - notifies AI to stop helping you
-AI will now return to defend its own base when it is in trouble
-AI defends the base more effectively
-max number of droids allowed to build was raised
-won't stop building trucks when low on power anymore

FIXES:
-won't prefer humans when choosing who to attack anymore
-won't attack own buildings
-disabled cheat that was giving AI free units when starting with 'Advanced Base' option



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1301 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-30 15:14:32 +00:00
Roman C 086dfd8b12 -swapped parameters for some scripting functions for consistency
-renamed some variables for the sake of clarity

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1300 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-30 15:12:15 +00:00
Dennis Schridde 4f63de3518 - Include lib/gamelib in the includes list (audp_parser didn't compile anymore...)
- Use compiler_cc instead of custom compiler detection


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1299 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-29 19:15:30 +00:00
Roman C 83b2fdb540 -Rewrote scripting language manual and updated function listing
-Converted manual from .rtf to .htm

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1298 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-29 16:24:17 +00:00
Dennis Schridde 4107156595 Another buildsystem update:
- Do not modify CFLAGS inside automake Makefiles
- Add NEWS and INSTALL to comply with GNU standards
- Use aclocal's include functionality instead of acinclude.m4


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1296 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-29 12:41:18 +00:00
Dennis Schridde 8c2c3c97a8 Clean yacc headers properly
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1295 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-29 10:08:12 +00:00