Commit Graph

6657 Commits (fbd7ba368a7367e6dde52ef38faa9d71f321b531)

Author SHA1 Message Date
Buginator 119ff9467f frontport r8670
"Trap transporter's alt-click to be MP only."


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8735 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:46 +01:00
Buginator 38f66c5f9e frontport r8667
"Rewrite the stupid file transfer routines.
* It will now only send the file to the person that needs it.

* Adds abort code to the file routines as well, and also tries to detect when the Host is using a malformed filename to host a map.

* Make sure user can't hit the 'ready' button when the map transfer is ongoing.

* Get rid of the silly delays (Much faster transfers)

NOTE: we are still capped by fps. 
fixes ticket:1128
fixes ticket:1127
refs ticket:215 (still can't transfer 'map packs')"

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8734 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Buginator 87802afa73 frontport r8666
"Never, ever, let users mess with the SP Transporter.
It breaks the SP scripts!"

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8733 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Buginator 5a2509a26d frontport r8651
"Add config variable 'UPnP' to enable/disable UPnP detection / routines.  1=on, 0=off, default is ON.
"

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8732 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Buginator 098a1ea117 frontport r8650
"To prevent some confusion rename 'game' structure in netplay.c to gamestruct.

'game' is used as MULTIPLAYERGAME structure everywhere else, and it used GAMESTRUCT in netplay.c"


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8731 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Buginator 1a1896e3bc Add the laser satellite to the limits screen.
fixes ticket:1227
Patch by 13KukYNexus666


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8730 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Guangcong Luo c7f5afb358 Add asserts for experience increase out of range.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8727 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Guangcong Luo ad7e87792d Use 32x32 cursors if unknown cursor type given.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8723 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:44 +01:00
Guangcong Luo bcef102074 Add small font for textdraw routines.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8720 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:44 +01:00
Guangcong Luo fbd286011c Remove "ready" text from ready checkbox image.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8715 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:44 +01:00
Per Inge Mathisen b4c6076b5d Fix indent
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8708 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:44 +01:00
Christian Ohm 55f12a5d52 Hurd build fixes.
Closes #969.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8706 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:44 +01:00
Per Inge Mathisen 89679c361a Significantly improve default AI no bases behaviour by making sure starting
trucks cooperate on an initial factory. Implements most of and closes ticket:1171


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8704 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:43 +01:00
Per Inge Mathisen 0e0ebd2c21 Immediately when a skirmish game is started, fire off the CALL_START_NEXT_LEVEL event.
Scripts should use this for some of the jobs previously given to the CALL_GAMEINIT event,
since the CALL_GAMEINIT event is run before many of the crucial game structures are
properly initialized.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8702 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:43 +01:00
Per Inge Mathisen 7aa47ef6aa Do not abort a script if it cannot find gateways running getNearestGateway().
See ticket:1218, issue reported by DylanDog.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8700 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:43 +01:00
Christian Ohm 125c69ffc9 Update Brazilian translation.
Closes #1064.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8698 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:43 +01:00
Per Inge Mathisen 2a23ae54bc Move player field into SIMPLE_OBJECT instead of duplicating it in every object type.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8697 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:43 +01:00
Per Inge Mathisen e73697495e Forward port r8652 and r8626 (savegame fixing and breaking) from 2.3
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8696 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:42 +01:00
Guangcong Luo d72395ef6f Remove "Start/Stop Multiplayer Audio" settings that are no longer used. Fixes bug #1203
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8694 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:42 +01:00
Guangcong Luo 21570fcc01 Remove a redundant if(!all)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8693 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:42 +01:00
Guangcong Luo b757cd4da4 Update readme
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8691 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:42 +01:00
Guangcong Luo c36b667194 Fix bug #1193: Crash when sending messages.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8689 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:42 +01:00
Thomas Barlow dd8097da19 Update page 17 with a further improved version.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8687 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:42 +01:00
Per Inge Mathisen 11a584851d Based on suggestion from player acidjnk, set all AI droids to 'do or die',
and stop AI from building repair centers. This should make AI harder.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8685 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:41 +01:00
Christian Ohm cd36584441 Don't access UPnP device info after freeing it.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8676 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:41 +01:00
Per Inge Mathisen 5e16640ba3 Build fixes for netplay.c on OpenBSD, closes ticket:1180
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8675 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:41 +01:00
Per Inge Mathisen e1c04d538c Make AI build lancer towers instead of non-existent lancer bunkers. Part of ticket:1171
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8668 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:41 +01:00
Thomas Barlow 507a22d423 Update wall and hardpoint models with new versions.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8664 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:40 +01:00
Christian Ohm 888a4cdb18 Update Dutch translation.
Refs #1033.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8663 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:55 +01:00
Christian Ohm 841480302e Update Italian translation.
Closes #1172.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8660 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:55 +01:00
Christian Ohm 20a3ee608e Update translations
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8658 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:55 +01:00
Per Inge Mathisen 3b425a0653 map2png: Fix conversion bug
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8656 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Per Inge Mathisen c6e328bbd3 Add debug message when map loading fails in map tools.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8655 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Giel van Schijndel fbec26f8e1 Improve compile time code checking:
* Use a version of STATIC_ASSERT that can be used as part of expressions
  - Taken from the Linux kernel (<linux/kernel.h>)
 * Add macro WZ_ASSERT_ARRAY which (statically) asserts that the given variable is an array
  - the given array needs to have a compile-time defined size
  - pointers will fail this assertion
 * Verify that the expression given to ARRAY_SIZE is truly an array
  - verify this using WZ_ASSERT_ARRAY_EXPR
 * Catch & fix two coding errors resulting from wrong use of some macros
  - macros: sstrcpy and ARRAY_SIZE

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8654 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Giel van Schijndel 0b1a35cd39 IRC lobby bot: improve production of game list
* Make sure to loop over all games only once instead of copying them
  - This might prevent a race condition
  - It definitly cleans up that piece of code
 * Make sure to list the Warzone version as well in game listings
 * Only show 2.2 games (instead of 2.1 games)
 * Bump the bot's version number from 0.0.1 to 0.0.2
 * Change 'Warzone Resurrection Project' to 'Warzone 2100 Project'

Original patch written by Buginator, rewritten by myself to be 'Pythonic'

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8653 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Christian Ohm d808f72d8e Don't add UPnP redirects in single player skirmish.
Closes #1174.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8647 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
Christian Ohm cd3ce412a3 Fix typos, reported by Paul Wise.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8646 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
Guangcong Luo 9dc3cac6d6 [Having problems committing, so I'm seeing if I can commit this one file at a time] Continue fixing bug #1170: compile warning.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8643 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
Guangcong Luo 38d9b086f6 [Having problems committing, so I'm seeing if I can commit this one file at a time] Fix bug #1170: compile warning.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8642 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
Guangcong Luo f6992d5719 sendTextMessage improvements - uses the position numbers again, and sends "(private to Player) message" instead of "0message". Also adds a shortcut for alliance chat: Use ".message" to send "(allies) message" to allies only.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8639 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
Guangcong Luo 5d411cdd32 Add the multiplayer alliances menu to the Intelligence menu - makes it easier for players to discover it, and helps players who don't have a Num-Enter button.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8637 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
Guangcong Luo 1858a569e7 Remove an assert for something that happens commonly while in cheat mode.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8635 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
Per Inge Mathisen 36dd15bd0d AI scripts: Fix parentheses in some expressions where canDroidReach was added.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8634 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
Per Inge Mathisen c5533ee514 Make AIs go for closest oil first. Closes ticket:1166
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8633 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
Guangcong Luo 2b7875a22b Check the order queue every once in a while, when executing an order that never ends.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8630 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
Guangcong Luo 6096e96ba4 Orders that never end (i.e. PATROL and CIRCLE) count as "not doing anything" for the purposes of queueing orders.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8628 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
Guangcong Luo bddf8c2aa6 Added DORDER_SCOUT to orderDroidList's list of queueable orders - it was there in 2.3-branch but not in trunk for some reason. Might fix bug #1161, but probably won't.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8627 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
Guangcong Luo cffeacf6f5 Fix a bug that caused transporter not to disembark when auto-repairing. Also allow disembark order to be queued (shift+alt+click).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8625 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
Guangcong Luo 5fa5d34a50 Use the jam cursor for scouting.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8622 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
Buginator f935d97a0d revert r8606.
This patch needs more work to work on both v7 and v36 game differences.

open ticket:1119 again :S


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8621 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00