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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b99b245e7f
Turns out that we can't use GLee.h for all our openGL header needs, since GLee.h defines Status, and we also use that, so until we fix that either in GLee.h or our codebase, going to revert r8615/r8616
...
FIXME! (to be done later)
closes ticket:153
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8618 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
c6747b1606
Don't use SDL_opengl.h, instead, use GLee.h to handle all our openGL needs.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8617 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
3665f20498
Use the correct header file when using openGL, instead of the more complex #if/else/endif block.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8616 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
6bfd7012cf
Update translations
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8613 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
ef04fec1e2
French translation enhancement.
...
Closes #1145 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8612 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:50 +01:00
d91693afb2
Hardware-accelerated cursors work correctly in Mac OS X now.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8610 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
6519ce48e9
Use GLuint correctly (fixes build errors and warnings caused by other fixes).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8608 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
359c5be959
Revert r8605, which was made in error.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8607 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
dda96a7059
Skirmish game fix:
...
Don't RemapPlayerNumber() for droids, they are a different kind of a beast. This maps the droids correctly now.
Fixes ticket:1119
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8606 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
86302cf060
Correctly handle when to enable/disable player's position choices.
...
We only really care if another human is there or not. We don't care about AIs.
fixes ticket:1137
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8605 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
9445f60753
Actually use GLuint instead of pretending to be GLuint.
...
patch by stiv.
Closes ticket:1148
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8604 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:48 +01:00
aabbca68d8
Move map download progress to players list, so you can still chat while it happens. Also update players list instantly, instead of every 2 seconds (except slider changes, which are updated every 0.5 seconds). Also fix taken position detection (fixes bug #1137 ).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8602 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:48 +01:00
Per Inge Mathisen
Christian Ohm
Guangcong Luo
Thomas Barlow
Giel van Schijndel
Buginator