Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,279 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

7279 Commits (901930360b04151444673770853cc10cf07aca87)

Author SHA1 Message Date
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
Per Inge Mathisen b124534b75 Add extra debug info for power generators and factories when clicked. Patch by Safety0ff in ticket:1469 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9889 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-20 15:00:14 +01:00
Per Inge Mathisen ca9c2448b6 Fix indenting of structurePowerUpgrade() 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9888 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-20 14:50:20 +01:00
Guangcong Luo 49f10d7b93 2.3: Commit patch #1612: Unify commander levels - fixes a bug relating to commander levels that allowed commanders to be assigned, for instance, 8 units out of a max of 6. 
Commanders now give MAX(level+1, commanderLevel) to their assigned units. They also have skirmish-style level-progressions. This should unify commanders so they behave the exact same way in skirmish and campaign.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9887 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-20 02:50:11 +01:00
Per Inge Mathisen 232a070ce2 Remove unused dead terrain code. From ticket:1616 by i-NoD. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9886 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-20 01:50:15 +01:00
Christian Ohm d6416c34eb Return 0 in the various _lex_destroy int functions. 
Original patch by Seismo (WarningC4716(_2).patch).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9884 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-20 00:50:15 +01:00
Christian Ohm 9f8722d2ff Updated Croatian translation by KukY. 
Closes #1367.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9880 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-20 00:00:21 +01:00
Christian Ohm a0f08bff1d Don't return a value in void function. 
Patch by Seismo (WarningC4098.patch).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9879 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-20 00:00:21 +01:00
Giel van Schijndel e4dd2951fe Installer: use the *.gmo files from ${TOP_BUILDDIR} 
The *.gmo files won't be placed in ${TOP_SRCDIR}.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9877 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 19:50:30 +01:00
Giel van Schijndel 77b16f76d6 Update po/POTFILES.in and po/*.po 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9875 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 19:50:29 +01:00
Giel van Schijndel 04eb3e1e06 po/update-po.sh: Search C++ files for translatable messages as well 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9873 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 19:50:28 +01:00
Giel van Schijndel 1b30058f75 po/update-po.sh: Change directory relative to the script instead of $PWD 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9871 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 19:50:28 +01:00
Giel van Schijndel 60c55e4009 #undefine NOMINMAX before #defining it 
Prevents warnings about #redefining previously #defined macros

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9869 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 18:00:09 +01:00
Giel van Schijndel 384e87976d Win32 crossbuild script: Make sure that win32/builds/libs exists 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9868 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 17:50:37 +01:00
Guangcong Luo f8754addc6 Add move status to `showorders` info. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9867 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 16:51:16 +01:00
René Jürgens 595d94c4d9 - NTW Mod: none Versions Number anymore 
- Less hit Points for Artillery (coz Artillery hit bug is removed) they are all on 25-35% now
- Mines & 3 Scavenger Bodys removed (others rebalanced)
- Color issue fixed
- Grim's Texture Mod removed

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9864 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 14:51:03 +01:00
Cyp a2dc1ffcde Use list of damaged objects instead of single damaged object, to avoid damaging the same pair of overlapping objects twice. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9863 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-19 12:50:37 +01:00
Per Inge Mathisen 478ed169ee Unify the treatment of the bTargetted hack, which displays crosshairs for enemy objects targetted 
by your sensor droids, and also removes duplicate feature tracking of object born time. Patch
reviewed by stiv.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9857 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-18 22:50:10 +01:00
Per Inge Mathisen 2d57f9cfd4 Contrary to base definition, the inFire variable is not a boolean. It is used a triple state variable. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9856 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-18 21:50:09 +01:00
Per Inge Mathisen 8fb38ab094 Remove unused tileVisBits - now superseded by tileExploredBits. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9855 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-18 20:50:24 +01:00
Per Inge Mathisen 9632b1bf50 Add backend support for gates using new REF_GATE structure type. See ticket:1179 for more info. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9854 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-18 20:50:24 +01:00
Per Inge Mathisen 5a1271be4c Allow loading maps of with erroneously placed features if asserts are turned off. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9848 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-18 16:50:45 +01:00
Buginator 0146f4e751 Fix ticket:1604 
limiter_tex.wrf is still needed by trunk.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9847 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 23:50:25 +01:00
Git SVN Gateway 3e7dd5ebcf ln -s .gitignore .bzrignore 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9846 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 21:50:57 +01:00
Git SVN Gateway a981dbf610 Workaround for texture corruption bug on Ati Mobility Radeon HD 2400 (R610) open source radeon + mesa drivers. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9845 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 21:50:57 +01:00
Buginator 2f13ea644f Correct typo (actually, c&p error) in r9842 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9844 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 08:50:11 +01:00
Buginator 6850d05a78 When player drops, and we were transferring a map to them, abort the send. 
Reported by themac on IRC.

Show the progress of the map being sent, of each player, to the host.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9842 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 06:50:19 +01:00
Guangcong Luo 608c53730f Fix deity mode ("deity" cheat and ctrl+g cheat) not revealing entire map. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9841 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 06:00:15 +01:00
Buginator 3a4251917c Fix host kicking people when the host selected the limiter while hosting, and not before hosting. 
Thanks to Michal (on forums) for finding the reason for these rare kicks.

Fix memory leak in in hash routine found by Per.

Add more LOG_NET debugging to clarify what we are doing.

fixes ticket:1577

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9839 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 05:50:29 +01:00
Per Inge Mathisen a960ffb42f semperfi: When AI has enough initial factories, send off initial trucks on a truck rush in an 
attempt to achieve total map control. First the closest unprotected oil resource to the enemy
is defended, then hardpoints are built around his base. This behaviour is currently experimental
and quite high risk, but works fine on some maps. Also fix bug that made AI not always pick quite 
closest the oil resource.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9837 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 00:50:13 +01:00
Per Inge Mathisen 106eeefb08 If we cancel a build order, check if we have more orders queued up that can be started instead. 
Also notify the AI scripts if a build order fails due to various common failure modes.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9836 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-17 00:50:13 +01:00