Commit Graph

7059 Commits (09a38375264b889033ca80ffc3419d9a2dffd0d9)

Author SHA1 Message Date
i-nod 09a3837526 Sync NSIS project with 2.3 version.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10021 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-27 22:51:27 +01:00
dak180 7e93e96524 Save space on releases by compressing everything we can.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10018 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-27 22:51:27 +01:00
i-nod 991b158f65 Use less complex zip calls or mingw32-make will fail.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10016 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-27 22:51:27 +01:00
Per Inge Mathisen 89b90ec8dc Shave 64 unused bits off each A* node.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10015 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-27 22:51:27 +01:00
Per Inge Mathisen f8d50ddbc6 Experiment with increasing zoom out distance slightly. Report back all feelings of
nausea and discomfort for further study.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10013 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-27 22:51:27 +01:00
dak180 7057faba66 Warzone 2100 is the full name of the game, so use that for the default display name on the mac.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10011 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-25 20:51:10 +01:00
Buginator 8ec55a5579 Handle socket clean up, then player cleanup, and then re-init the player who left.
Fixes the issue of seeing leave messages with the default AI color names, instead of the person who left name.

(2.3 r10004)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10010 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-25 05:50:39 +01:00
Buginator c402fb2f2a Committed wrong patch for r9992.
When host drops at that point, just close up shop, and set lobby error.

Thanks to Cyp for noticing.

(2.3 r10003)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10009 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-25 05:50:39 +01:00
Buginator 66d2fb68ec Broadcast NET_HOST_DROPPED on host dropped in NET_fillBUffer()
(2.3 r9992)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10001 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-24 06:50:37 +01:00
Buginator ae3e6e80a7 broadcast all player's stats.
This should fix the issue where, on joins, people would sometimes see different medals (pacifier) instead of what the remote player actually has. 

(2.3, r9991 & r9993)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10000 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-24 06:50:37 +01:00
Buginator 3433d5fb58 Make sure the localOptionsReceived flag is set correctly when the refresh widget is hit
(would cause people to enter a game, and only see all AI's, instead of the actual players)

(2.3 r9990)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9999 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-24 06:50:37 +01:00
Buginator 8a785d511c If we run out of temp sockets, then we should error out, not "fix" the issue by reusing MAX_TMP_SOCKETS -1.
(2.3 r9988)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9998 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-24 06:50:37 +01:00
Buginator 15b25dcdfe Add more LOG_NET debugging love.
No code changes (besides adding debug(LOG_NET...))

Change some LOG_WARNINGS to either LOG_ERROR (since they are) or LOG_INFO (since we should know about this)

(2.3 r9987, r9989)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9997 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-24 06:50:36 +01:00
Buginator a485fa69c6 When we leave, only tell the host that we are leaving, and have the host tell everyone else about the player leaving.
(2.3 r9986)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9996 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-24 06:50:36 +01:00
Buginator e8ff3ec7bf Make sure we mark the socket invalid in the socket set when we are about to close the socket.
This will fix (hopefully) the remaining segfault issues in checkSockets().
(2.3 r9985)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9995 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-24 06:50:36 +01:00
Buginator 519db7a374 To prevent closing the socket before the receiving end can receive the 'quit' message, add a delay of 1s.
This should fix the issue of players dropping, and nobody would notice that they left until they had a heart attack.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9994 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-24 06:50:36 +01:00
Christian Ohm eeeb453139 make dist: Include whole macosx directory instead of listing every file.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9982 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-23 15:50:47 +01:00
Giel van Schijndel a6a1ffbaa0 Explicitly link with -lX11 when running on an X11 system because we directly use X11 in lib/widget/scrap.c
This fixes #1098 also reported as DebianBug:556919.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9980 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-22 14:51:00 +01:00
Cyp 8f8cc30847 Clean up droidUpdateDroidRepair. Add droid->body <= droid->originalBody assert in CHECK_DROID.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9979 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-22 09:50:27 +01:00
Giel van Schijndel fafeb245d9 Win32 cross build scripts: Add http://www.il.fontys.nl/~giel/warzone/devpkg/ as mirror for package archives
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9975 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-22 01:50:21 +01:00
Giel van Schijndel 1ed72f87ab Don't use EPIPE when it doesn't exist
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9973 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-22 01:00:19 +01:00
Per Inge Mathisen 21bd0ffdc3 Fix assert if socket set not allocated but socket needs to be deleted. Patch reviewed by cybersphinx and Giel.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9968 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-22 00:50:38 +01:00
Per Inge Mathisen 9bbf6a655c Sync up network changes from 2.3
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9964 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-22 00:50:38 +01:00
Giel van Schijndel 2c09022412 NetPlay refactoring:
* Rename addSocket to more descriptive SocketSet_AddSocket
 * Rename delSocket to more descriptive SocketSet_DelSocket

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9952 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 21:50:20 +01:00
Giel van Schijndel 401723958c Make backtraces regarding FD_SET related crashes (see #1136) more useful
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9950 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 21:50:20 +01:00
Giel van Schijndel fa787fcc80 Win32 cross build scripts: Apply revision 5375 from the SDL repository as a patch to SDL-1.2.14.
This fixes #1340, also reported as SDLBug:849.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9948 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 20:50:19 +01:00
Guangcong Luo 582962732d Rebalance 0.7.0 - The cannon overhaul.
Cannons and rails have their original 1.10 HP levels restored.

- Heavy Cannon was moved later-game
- Assault Cannon, Twin Assault Cannon, and Hyper Velocity Cannon were moved earlier-game (and rebalanced accordingly)
- Assault Cannon, Twin Assault Cannon, were made lighter
- Hyper Velocity Cannon can now hit air units, penetrate units, and is lighter, but reloads more slowly and has less HP. It no longer replaces Medium Cannon
- Plasma Cannon has been made into a cannon (prereqs: HPV + Inferno + DSLDA3), and has been rebalanced accordingly.
- Hyper Velocity Cannon can now hit air.
- Cannons, rails, mortars, and howitzers have their splash damage increased.
- Ripples and Archies have been nerfed.
- Lancer has had its damage slightly nerfed. A full lancer rebalance is planned for later.
- Analogous changes have been done to the corresponding cyborgs and VTOL weapons, as well.

("Rebalanced accordingly" means that the component price, research price, and damage have been adjusted to fit the new techlevel.)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9945 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 18:50:16 +01:00
Guangcong Luo 9dbc31ade2 Fix bug #1612 - ignore `turnOffMultiMsg` for sending droid deaths from HP loss, since they aren't handled by the caller of `turnOffMultiMsg`.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9943 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 17:50:42 +01:00
Giel van Schijndel d96986488f Netcode, refactoring: move setting of (SOL_SOCKET, SO_NOSIGPIPE) to a function rather than duplicating code
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9939 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 16:50:45 +01:00
Giel van Schijndel 2322e1f03d Use a decently named constant for passing to setsockopt(SOL_SOCKET, SO_REUSEADDR)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9938 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 16:50:45 +01:00
Giel van Schijndel 36cd206534 Netcode: slight refactoring, move connection status checking into a separate predicate function: connectionIsOpen
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9937 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 16:50:44 +01:00
Giel van Schijndel f5f030a763 configure: Check for -fstack-protector and use it if available
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9936 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 16:50:44 +01:00
Christian Ohm c95d5071c0 Updated Polish translation by Emdek.
Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9932 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 15:50:45 +01:00
dak180 9e93356756 Better handling of msgfmt dependancies.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9929 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 07:00:34 +01:00
Buginator a549962a9e If we are forced to quit the game, then we should do that, instead of hanging around in the lobby all by ourselves.
(2.3: r9924)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9928 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 06:50:54 +01:00
Buginator d03dbc0a87 If we were in the middle of a file transfer, and we abort out, close filehandle.
If a file exists, but we can't read it (for whatever reason), then leave the game 'nicely', and abort out of game, since it is a fatal error.
(2.3: r9923)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9927 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 06:50:54 +01:00
Buginator b056e7184c DyDo 2.0.5 debut, NSIS, Makefile.am and Makefile.win32 fixes for the mod.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9926 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 06:50:54 +01:00
Giel van Schijndel f02cd084d9 Copy paste error, make sure to use the proper file descriptor
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9921 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 01:50:21 +01:00
Giel van Schijndel 39afcf0604 Win32 cross build script: Optionally downgrade to SDL 1.2.13
Use SDL 1.2.13 instead of 1.2.14 when asked for, SDL 1.2.14 has some
problems on Windows, see #1340. Unfortunately SDL 1.2.13 has other
problems on Windows 7.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9919 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 01:50:21 +01:00
Giel van Schijndel 4aa213a937 Do our very best *not* to receive SIGPIPE:
When possible do:
 * Set socket option SO_NOSIGPIPE
 * Pass MSG_NOSIGNAL to send(2)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9917 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 01:00:16 +01:00
Giel van Schijndel d4b0ab8c21 Socket API, writeAll: Detect disconnects *before* we're slapped in the face with SIGPIPE
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9913 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 00:50:15 +01:00
Giel van Schijndel cfaaf057f5 Be nice and act according to POSIX spec and check for EWOULDBLOCK as well as EAGAIN
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9912 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 00:00:26 +01:00
René Jürgens 98717c39e8 - Put Mines back and them + Scavenger Structures in Research.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9911 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 22:50:22 +01:00
Giel van Schijndel 74f4f8a1e2 Make sure that we definitly won't allocate memory while in the exception handler
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9905 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 20:50:23 +01:00
Giel van Schijndel 4bfa5e928d dumpinfo.cpp:
* Make sure that config.h is #included (for PACKAGE_DISTRIBUTOR)
 * addDumpInfo: don't (explicitly) convert the parameter to std::string
  - std::ostream already takes care of that ''if'' necessary (usually it isn't)
 * addDumpInfo: use a 24 hour clock (%H to strftime instead of %I)
  - more info in the same bytes!
 * sizeof instead of magic numbers

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9904 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 20:50:23 +01:00
Giel van Schijndel 02b24836bf Win32 cross build script:
* Use `set -e` instead of `#!/bin/sh -e` as the former is portable, unlike the latter
 * Use "$()" for a nested shell instead of backticks as the former allows proper nesting

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9898 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 19:50:46 +01:00
Per Inge Mathisen 6ffc914e02 Remove unused or duplicate power generator management code.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9895 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 17:01:01 +01:00
Per Inge Mathisen 37cc884033 This should hopefully fix the remaining power generator issues in the game. A base
value was added to a multiplier value in the case of power gens with power modules, 
and the base value is unused and zero, dropping the power module bonus on power 
research. This closes ticket:1469


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9893 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 17:01:01 +01:00
Per Inge Mathisen 4ecccf27a9 Remove never used how-much-power-left-in-oil derrick feature. See ticket:1589 for discussion.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9892 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 15:50:35 +01:00
Per Inge Mathisen 48a1bac97b Fix power output of starting power generators in medium base starts, which was twice the correct
amount until the first power upgrade was researched. The power multiplier was not recalculated
after removing the power module in cleanMap().


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9890 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 15:00:15 +01:00