Commit Graph

5924 Commits (9c52d2d07f767cc125aaf28b7a312aed4ad38d6c)

Author SHA1 Message Date
Gerard Krol fe7dfb2b1a Rename the dirDiff function to moveDirDiff and remove the old moveDirDiff which was just a duplicate. 2009-06-01 21:27:15 +02:00
Buginator 6d08939f11 Update NSIS again, and add the wz2100header.bmp that NSIS uses.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7625 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:57 +02:00
Guangcong Luo a72fb9094d Updated icon file - new 32x32x256, 16x16x256, 32x32x16 versions, other versions updated to be more readable at lower resolutions.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7622 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:57 +02:00
Guangcong Luo 7fa42b2038 Add a high-resolution of the Warzone logo.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7621 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
Per Inge Mathisen 111711ad6b trunk: Revert removal of line in Makefile.am that was (at least sometimes) necessary to build base.wz and mp.wz.
Also make sure all .wz archives are generated on 'make dist', so as not to require 'make' to be run first.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7620 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
Guangcong Luo 62c9c4abab Icons now have 32x32x16 version.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7611 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
Per Inge Mathisen 9ac1b1adfd Fix 'make dist' for trunk.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7609 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
Per Inge Mathisen 91c9a8c7f7 Remove unused/unmaintained file for waf builds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7605 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
Guangcong Luo 7c9ba61782 New icons by Garrett Wiens-Kind <Neuralize>, 16x16 version by Zarel.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7603 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:55 +02:00
Guangcong Luo 0429360f72 New Warzone logo created by Garrett Wiens-Kind <Neuralize>.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7601 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:55 +02:00
Buginator ebbc650470 Move AIV from global to multiplay, since it is only a MP mod.
Update makefile(s) as well, and configure.ac


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7596 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:55 +02:00
Buginator 173488dcbc Update changelog / docs
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7595 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:54 +02:00
Buginator 1932d8d95d mod elaboration code added
Tells user if the mod entered on the command line is enabled, or is invalid.
Output is to stdout or stderr.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7594 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:54 +02:00
Buginator 2fd30d2818 The hack from r7341 seems to break Mac OS X compiles.
Added #if guards around the hack.

Thanks to Vermithrax for the heads up.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7593 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-30 19:24:49 +02:00
Buginator 0c73d7516f Partial Revert of r7447, AI scripts all reverted back.
Will fix the issue another way. Old (skirmish) savegames from previous versions of the game will work again.

refs ticket:406


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7580 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-30 19:24:48 +02:00
Per Inge Mathisen 274db0c51f Add an O(1) path-finding check function that tells us whether it is possible
for a droid with a given propulsion type to go from position A to position B.
It generates some static information on map load using a flood fill algorithm
which takes some time.

Use this function to make sure we do not try to return to repair to a repair
centre that we cannot reach. Closes ticket:546


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7578 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-30 19:24:48 +02:00
Christian Ohm 3755741432 Run update-po
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7565 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:35 +02:00
Buginator e04f4f9bea Add a new translation: zh_TW.po by chtsau
Closes ticket:239 and ticket:439 as well.

Thanks!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7563 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:34 +02:00
Guangcong Luo 3c18bbf28d Fix bugs #533, #292, and #398 - Angel missile no longer obsoletes long-range artillery, Ripple Rockets no longer autoupgrades to Archie, and Mortar Fast Loader requires Mortar Rapid Loader Mk3.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7558 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:34 +02:00
Per Inge Mathisen f1a946260e Make AI ignore hostile structures for path-finding when using armed droids. This avoids a problem
getting to the enemy when the nearest point to the target is an impassable terrain obstacle. It
also avoids a pathological path-finding case that makes us search the entire map for a nearest 
point whenever we cannot go somewhere due to enemy structures (eg walls), which wastes a lot of 
CPU. Human players are unaffected by this change.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7555 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:34 +02:00
Christian Ohm f98926d94d Run update-po
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7554 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:34 +02:00
Christian Ohm 5b1833062a Fix typo
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7553 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:33 +02:00
Christian Ohm 9862e33528 Run update-po
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7550 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:33 +02:00
Guangcong Luo d2f3f8bd42 Revert accidental commit of changes to move.c in r7544.
The other accidental changes are a change to frontend0.png that will be overwritten soon, and the removal of a few unnecessary aborts, which can probably stay.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7547 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:32 +02:00
Guangcong Luo 9000a57144 Fix bug #541 - Uninstaller misses some files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7544 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:31 +02:00
Giel van Schijndel 452c507de1 Networking:
* Only clean up the IPv4 socket if we are able to enable IPv4 mapping of IPv6 addresses ''and'' are able to create an IPv6 socket
 * Add some more debug messages to be able to see what sockets could be created
 * Close sockets when they've become useless/invalid

This should fix #534 for real (unlike r7541, which fixed it and then reintroduced another bug causing the same symptom).


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7543 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:31 +02:00
Buginator b55474c98a *Change* how many savegames we have (now a max of 36).
Report the savegame name on the console when we save.

Thanks to cybersphinx for the centering fix
closes ticket:535

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7542 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:30 +02:00
Giel van Schijndel c2f8273762 Make setting up of the IPv4 and IPv6 sockets indepent:
* Allow failure for setting up of one of the sockets
  - More accurately: require only one socket to succeed
 * Try to use the IPv4 to IPv6 mapping feature if the host OS provides it
  - This allows us to use only a single socket on those systems for both listening to IPv4 and IPv6

This should fix #534.



git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7541 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:30 +02:00
Giel van Schijndel 7e6afc09cb #include all required headers (<netinet/in.h> for sockaddr_in and sockaddr_in6)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7540 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:30 +02:00
Giel van Schijndel 1b11d622f1 Exceptionhandler: Remove signal descriptions for signals that are either non fatal or simply not handled by our signal handler
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7539 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:29 +02:00
Giel van Schijndel 7bb1474692 FreeBSD #defines alloca() in <stdlib.h>, not <alloc.h> (that's a Linux/glibc thing), so make the #included file platform dependent
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7538 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:29 +02:00
Giel van Schijndel ecbe152f7c Don't #define _XOPEN_SOURCE on FreeBSD as on that platform it actually causes several functions to be ''hidden''.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7537 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:29 +02:00
Giel van Schijndel 6e4c85a1b3 Allow usage of 'Flex' from non-standard locations
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7536 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:28 +02:00
Buginator 00c10bd866 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7525 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:28 +02:00
Buginator efc5aee0d2 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7524 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:28 +02:00
Buginator ef1c6eb400 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7523 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:28 +02:00
Buginator c127adc19f Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7522 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:27 +02:00
Buginator 59a1576ddb Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7521 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:27 +02:00
Buginator c541cc63f0 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7520 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:27 +02:00
Buginator 05a98f3361 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7519 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:26 +02:00
Buginator fd91dd977e Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7518 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:26 +02:00
Buginator ec2a78df63 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7517 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:26 +02:00
Buginator 8160e6c352 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7516 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:26 +02:00
Buginator 7b445aa461 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7515 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:25 +02:00
Buginator c5bad8db10 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7514 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:25 +02:00
Buginator 26cd8e5b42 Only use abort() for fatal conditions: abort() cleanup patch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7513 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:25 +02:00
Buginator e2a15031b4 Fix a bug broken in r1734 (doesn't make any sense to check a negative value for building type)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7510 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:25 +02:00
Buginator b0605e8518 Excise code of useless abort()s & use ASSERT_OR_RETURN to prevent GIGO, and also fix miscellaneous issues of removing things that made by eyes bug out.
*NOTE*, there should be no logic changes besides converting ASSERT() to ASSERT_OR_RETURN()!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7509 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:25 +02:00
Buginator 7878aff18e Use ASSERT_OR_RETURN to prevent GIGO, and also fix miscellaneous issues, and other things that made by eyes bug out.
*NOTE*, there should be no logic changes besides converting ASSERT() to ASSERT_OR_RETURN()!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7508 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:24 +02:00
Giel van Schijndel df13cc83ee Fix a typo: NotImlementedError -> NotImplementedError
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7502 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:24 +02:00