Menu
▾
▴
[Warzone2100-commits] mainline - qt-trunk: 479 commits.
|
From: <vu...@st...> - 2010-10-09 13:12:09
|
Commit: 9635b01ef0ebc55f88694d00ced81aba7e3ad3cf
Author: Cyp <cy...@wz...>
Date: Sun Feb 7 22:37:32 2010 +0100
newnet: Add NetQueue class.
lib/netplay/Makefile.am | 2 +
lib/netplay/netqueue.cpp | 395 ++++++++++++++++++++++++++++++++++++++++++++++
lib/netplay/netqueue.h | 103 ++++++++++++
3 files changed, 500 insertions(+), 0 deletions(-)
-------------------------
Commit: a336d6455db662e3e9c7816c2785e63c12a7e43d
Author: Cyp <cy...@wz...>
Date: Tue Feb 9 09:30:49 2010 +0100
newnet: Rename lib/netplay/nettypes.c to lib/netplay/nettypes.cpp.
.gitignore | 6 ++++++
lib/netplay/Makefile.am | 2 +-
lib/netplay/makefile.win32 | 3 ++-
lib/netplay/{nettypes.c => nettypes.cpp} | 0
4 files changed, 9 insertions(+), 2 deletions(-)
-------------------------
Commit: 8991ed6e761aaa6cf06e2e45874bbe69fa3fb1a7
Author: Cyp <cy...@wz...>
Date: Tue Feb 9 18:43:53 2010 +0100
newnet: Replace use of NETMSG with NetQueue. Breaks multiplayer, which never really worked, anyway. Compiles, links and runs, but freezes in multiplayer.
lib/netplay/netlog.c | 4 +-
lib/netplay/netlog.h | 2 +-
lib/netplay/netplay.c | 710 ++++++++++++++++++----------------------------
lib/netplay/netplay.h | 19 +-
lib/netplay/netqueue.cpp | 149 ++++-------
lib/netplay/netqueue.h | 74 ++++-
lib/netplay/nettypes.cpp | 591 ++++++++++++++++++++++----------------
lib/netplay/nettypes.h | 59 +++-
src/multibot.c | 101 ++++----
src/multigifts.c | 32 +-
src/multigifts.h | 8 +-
src/multiint.c | 72 +++---
src/multijoin.c | 6 +-
src/multijoin.h | 2 +-
src/multiopt.c | 18 +-
src/multiplay.c | 154 +++++-----
src/multirecv.h | 68 +++---
src/multistat.c | 6 +-
src/multistat.h | 4 +-
src/multistruct.c | 31 +-
src/multisync.c | 28 +-
src/structure.c | 2 +-
22 files changed, 1062 insertions(+), 1078 deletions(-)
-------------------------
Commit: 7e18c645335c98caf572cc9413c542ba876a894f
Author: Cyp <cy...@wz...>
Date: Wed Feb 10 23:45:52 2010 +0100
newnet: Change NetQueue into a message queue instead of a byte queue and fix some things. Take into account that NETbeginDecode isn't always matched with NETend, just most of the time.
Apart from each player playing a completely different games, multiplayer seems to work now. The players can chat with each other.
So everything seems normal, just with slightly worse synchronisation; now with literally no synchronisation, instead of just practically no synchronisation.
Newly built trucks are doubled, due to listening to own game messages. Game messages ought to all be implied (and not sent), or sent but not executed until received.
lib/netplay/netlog.c | 23 ++--
lib/netplay/netplay.c | 16 ++-
lib/netplay/netqueue.cpp | 364 ++++++++++-----------------------------------
lib/netplay/netqueue.h | 164 ++++++++-------------
lib/netplay/nettypes.cpp | 97 ++++++-------
lib/netplay/nettypes.h | 2 +
src/multiint.c | 2 +
src/multiopt.c | 2 +
src/multiplay.c | 2 +
9 files changed, 217 insertions(+), 455 deletions(-)
-------------------------
Commit: e9e30bcb27153e8475b9e4ce5abb591da42fba66
Author: Cyp <cy...@wz...>
Date: Thu Feb 11 12:39:07 2010 +0100
newnet: Synch game queues, and play them back at the same rate on all clients. Multiplayer now "works" as it did before, with the advantage that it will be possible to remove the bMultiMessages hacks and implement real multiplayer support.
I even tested that campaign, skirmish, saving and loading still works.
lib/gamelib/gtime.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++
lib/gamelib/gtime.h | 17 ++++++++++
lib/netplay/netplay.c | 47 ++++++++++++++++++++-------
lib/netplay/netplay.h | 10 +++---
lib/netplay/netqueue.cpp | 9 ++++-
lib/netplay/netqueue.h | 7 ++--
lib/netplay/nettypes.cpp | 58 +++++++++++++++++++++++----------
lib/netplay/nettypes.h | 1 +
src/init.c | 13 +++++++
src/loop.c | 9 +++++
src/multiopt.c | 6 ---
src/multiplay.c | 64 +++++++++++++++++++++++++++++++++++-
src/multiplay.h | 1 +
src/orderdef.h | 2 +
14 files changed, 279 insertions(+), 46 deletions(-)
-------------------------
Commit: a8dae49113489957f8642bef0e2d814e5bd7e59d
Author: Cyp <cy...@wz...>
Date: Thu Feb 11 14:18:15 2010 +0100
newnet: Convert NET_DROIDINFO, NET_DROIDMOVE, NET_GROUPORDER and NET_SECONDARY. A pair of trucks can now patrol for 10 seconds or so, before going out of synch (was previously 1 second).
src/group.c | 2 ++
src/loop.c | 2 ++
src/multibot.c | 4 +++-
src/multiplay.c | 14 +++++++-------
src/multisync.c | 5 +++--
src/order.c | 35 ++++++++++++++++++++++++++---------
6 files changed, 43 insertions(+), 19 deletions(-)
-------------------------
Commit: d1ba8c087b153a5063802e9bbbd46cd2679f3cae
Author: Cyp <cy...@wz...>
Date: Thu Feb 11 23:41:35 2010 +0100
newnet: Remove extra game queue, added due to misunderstanding.
lib/gamelib/gtime.c | 10 +++++-----
lib/netplay/netplay.c | 4 ++--
lib/netplay/nettypes.cpp | 4 ++--
src/init.c | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
-------------------------
Commit: 1943e08ba8ff6059135f9b09e0b970a9677e0d47
Author: Cyp <cy...@wz...>
Date: Fri Feb 12 01:11:01 2010 +0100
newnet: Change popped too much assert to warning, since the queue might have been cleared if a player disconnects. May still wait for NET_GAME_TIME messages from the player that no longer exists.
lib/netplay/netplay.c | 9 ++-------
lib/netplay/netqueue.cpp | 6 +++++-
src/multiint.c | 1 +
3 files changed, 8 insertions(+), 8 deletions(-)
-------------------------
Commit: 864b830a4426b93ca1a3bb9f41ae8f2863966eff
Author: Cyp <cy...@wz...>
Date: Fri Feb 12 09:32:17 2010 +0100
newnet: Don't wait for dropped players to send NET_GAME_TIME. Add more comments and cleanup.
lib/gamelib/gtime.c | 24 +++++++++++++-----------
lib/netplay/netplay.c | 1 -
lib/netplay/netplay.h | 10 ----------
lib/netplay/netqueue.cpp | 2 ++
lib/netplay/netqueue.h | 11 +++++++++--
lib/netplay/nettypes.cpp | 31 ++++++++++++++++++++-----------
lib/netplay/nettypes.h | 26 ++++++++++----------------
src/loop.c | 2 +-
8 files changed, 55 insertions(+), 52 deletions(-)
-------------------------
Commit: 6cdde8d607aa871c9a18e3e54290967ed0918d28
Author: Cyp <cy...@wz...>
Date: Fri Feb 12 16:41:37 2010 +0100
newnet: Make main thread block on second call to fpathDroidRoute. This makes the code more deterministic, improving synch a lot.
Also, merge most of fpath.c from Qt branch, fixes a useless delay before pathfinding starts and should reduce merge conflicts later.
src/fpath.c | 127 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 95 insertions(+), 32 deletions(-)
-------------------------
Commit: 33790b11a2f7d6b92ef0796da4099da1c5ba3705
Author: Cyp <cy...@wz...>
Date: Fri Feb 12 18:40:13 2010 +0100
newnet: Rename all messages that go into game queues from NET_BLAH to GAME_BLAH, remove unused messages, and assert that the right messages go into the right kinds of queues.
lib/gamelib/gtime.c | 8 +-
lib/gamelib/gtime.h | 6 +-
lib/netplay/netlog.c | 106 ++++-------------------------
lib/netplay/netlog.h | 2 +-
lib/netplay/netplay.c | 92 ++++++++++++++++++++++----
lib/netplay/netplay.h | 139 ++++++++++++++++++---------------------
lib/netplay/nettypes.cpp | 16 +++++
src/multibot.c | 42 ++++++------
src/multigifts.c | 24 +++---
src/multiint.c | 2 +-
src/multiplay.c | 167 +++++++++++++++++++++++-----------------------
src/multistruct.c | 20 +++---
src/multisync.c | 20 +++---
src/structure.c | 2 +-
14 files changed, 319 insertions(+), 327 deletions(-)
-------------------------
Commit: 1b41da254b047501b0916de7abfd8a287fc70bd1
Author: Cyp <cy...@wz...>
Date: Fri Feb 12 20:55:11 2010 +0100
newnet: Process own GAME_ARTIFACTS messages (and remove the corresponding duplicate code).
src/design.c | 3 +--
src/multigifts.c | 52 ++++++++++------------------------------------------
src/multiplay.c | 2 +-
src/objmem.c | 10 +++++++---
src/objmem.h | 3 +++
src/scriptfuncs.c | 5 +----
6 files changed, 23 insertions(+), 52 deletions(-)
-------------------------
Commit: 75b06b330a27bcd41014e5cb0171fbe81c08f8b3
Author: Cyp <cy...@wz...>
Date: Sun Feb 14 00:00:21 2010 +0100
newnet: Use deltas to stop GAME_CHECK_DROID from breaking things that aren't already broken.
lib/netplay/netlog.c | 2 -
lib/netplay/netplay.h | 2 -
lib/netplay/nettypes.cpp | 23 +++
lib/netplay/nettypes.h | 18 ++
src/droid.c | 2 +
src/droiddef.h | 3 +
src/fpath.c | 4 +-
src/multiplay.c | 7 +-
src/multiplay.h | 1 -
src/multisync.c | 475 +++++++++++++---------------------------------
src/objmem.c | 1 +
11 files changed, 179 insertions(+), 359 deletions(-)
-------------------------
Commit: 08fc464a8048f0000f2cb520339c9f524bae1a30
Author: Cyp <cy...@wz...>
Date: Sun Feb 14 12:31:58 2010 +0100
newnet: Use deltas to stop GAME_CHECK_POWER from breaking things that weren't already broken.
src/multiplay.c | 4 +-
src/multisync.c | 83 ++++++++++++++++++++++++++++--------------------------
2 files changed, 45 insertions(+), 42 deletions(-)
-------------------------
Commit: 529884479709736d8d228ae1bff7daa46ff48355
Author: Cyp <cy...@wz...>
Date: Sun Feb 14 17:02:05 2010 +0100
newnet: Use deltas to stop GAME_CHECK_STRUCT from breaking things that aren't already broken.
src/multiplay.c | 2 +-
src/multisync.c | 273 +++++++++++++++++++++----------------------------------
2 files changed, 104 insertions(+), 171 deletions(-)
-------------------------
Commit: f978943eb682141a354504b6178a596643b04103
Author: Cyp <cy...@wz...>
Date: Tue Feb 16 23:02:27 2010 +0100
newnet: Fix the host mixing up broadcast messages with messsages to the host, by making NetQueue even more message-oriented. Use -Wall -Werror on C++ files too, and fix the corresponding werrors. Don't use gameRand() from scripts, since the scripts are apparently only executed on the host. Add syncDebug() log function, which is only printed, if it would print different things on different clients.
configure.ac | 2 +-
lib/gamelib/gtime.c | 2 +
lib/netplay/netplay.c | 348 ++++++++++++++++++++++++++++++++--------------
lib/netplay/netplay.h | 10 ++-
lib/netplay/netqueue.cpp | 80 ++++++-----
lib/netplay/netqueue.h | 16 ++-
lib/netplay/nettypes.cpp | 119 +++++++++++++----
lib/netplay/nettypes.h | 17 ++-
src/map.h | 2 +-
src/multiplay.c | 3 +
src/random.cpp | 16 ++-
src/random.h | 5 +
src/scriptfuncs.c | 2 +-
src/wavecast.cpp | 2 +-
14 files changed, 435 insertions(+), 189 deletions(-)
-------------------------
Commit: 8c5712e6cbb97f04ac4d1a735932e0f2bd0b182e
Author: Cyp <cy...@wz...>
Date: Sat Feb 20 11:48:52 2010 +0100
newnet: Move checking for NET_ and GAME_ messages from the middle of an update to before deciding whether to update, fixes doing half of an update too soon on some clients. Fix droid synch messages going out of synch.
A few groups of patrolling trucks belonging to different players, and bumping into each other all the time stay in synch for several minutes, at least if not doing unsynchronised actions such as building new trucks (adding a lot of trucks, before ordering any of them to patrol is fine). They seem to get stuck in traffic jams, but at least they are synchronised traffic jams.
lib/gamelib/gtime.c | 17 ++++++++++++-----
lib/gamelib/gtime.h | 7 +++++--
lib/netplay/netplay.c | 21 +++++++++++++++++++++
lib/netplay/netplay.h | 1 +
src/loop.c | 17 +++++++++++------
src/main.c | 2 +-
src/multiplay.c | 3 ---
src/multisync.c | 18 +++++++++++++-----
src/random.cpp | 10 ----------
src/random.h | 5 -----
10 files changed, 64 insertions(+), 37 deletions(-)
-------------------------
Commit: 65196b0bd9ded61331820b603d99ce164196b177
Author: Cyp <cy...@wz...>
Date: Sat Feb 20 13:17:58 2010 +0100
newnet: Sanity check that floating point is the same on all machines.
src/main.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
-------------------------
Commit: 36a6036b9f8ad5e73467bb29b027258e98add83d
Author: Cyp <cy...@wz...>
Date: Sun Feb 21 16:51:20 2010 +0100
newnet: Fix corner case which resulted in updating before all messages had arrived. Make NET_FIREUP start the game before processing more messages (fixes case where one client is running under valgrind, or is just very very slow).
lib/gamelib/gtime.c | 9 ++++++---
lib/netplay/netplay.c | 2 +-
src/multiint.c | 4 +++-
3 files changed, 10 insertions(+), 5 deletions(-)
-------------------------
Commit: d162228e11939fedc55df313b65abaa019c3fb44
Author: Cyp <cy...@wz...>
Date: Sun Feb 21 18:21:06 2010 +0100
newnet: Fix po/POTFILES.in, so fresh builds work.
po/POTFILES.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0ff90af..d68f682 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -172,7 +172,7 @@ lib/ivis_opengl/textdraw.c
lib/netplay/netjoin_stub.c
lib/netplay/netlog.c
lib/netplay/netplay.c
-lib/netplay/nettypes.c
+lib/netplay/nettypes.cpp
lib/script/codeprint.c
lib/script/event.c
lib/script/eventsave.c
-------------------------
Commit: af28145369fb0234ce5f1c28eb6f6dabd2d2bf5b
Author: Cyp <cy...@wz...>
Date: Mon Feb 22 13:29:28 2010 +0100
newnet: Make GAME_DROID synchronised, now possible to build lots of trucks and stuff without going out of synch.
lib/netplay/netplay.c | 3 +--
newnet.TODO | 16 ++++++++++++++++
src/droid.c | 31 +++++++++++++++++++------------
src/droid.h | 12 ++++++++++--
src/game.c | 23 ++++++++---------------
src/hci.c | 14 ++++++++++----
src/keybind.c | 6 ++++--
src/mission.c | 2 +-
src/multibot.c | 42 ++++++++++++++++++++++++++----------------
src/multiplay.c | 2 +-
src/multiplay.h | 3 ++-
src/scriptfuncs.c | 4 ++--
src/structure.c | 4 ++--
13 files changed, 102 insertions(+), 60 deletions(-)
-------------------------
Commit: 8077c761e44020dfb42b85c9f0224c9b1318e40a
Author: Cyp <cy...@wz...>
Date: Mon Feb 22 14:21:01 2010 +0100
newnet: Make GAME_DROIDDEST synchronised, improve synch recovery.
lib/netplay/nettypes.cpp | 2 ++
lib/netplay/nettypes.h | 2 ++
src/droid.c | 1 +
src/multibot.c | 2 +-
src/multiplay.c | 2 +-
src/multisync.c | 29 ++++++++++++++++++-----------
6 files changed, 25 insertions(+), 13 deletions(-)
-------------------------
Commit: fc03507ad4f1b742660889c2702f6fc38f7809d4
Author: Cyp <cy...@wz...>
Date: Mon Feb 22 18:38:11 2010 +0100
newnet: Remove self-described "horrible check" which told droids to behave in an unsynchronised manner.
src/ai.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
-------------------------
Commit: 7ac7ef1d1f7de079780b59ed01e7c0357c2a467c
Author: Cyp <cy...@wz...>
Date: Mon Feb 22 19:05:38 2010 +0100
newnet: Print if messages are unhandled. Remove meaningless NET_SCORESUBMIT.
lib/netplay/netplay.c | 1 -
lib/netplay/netplay.h | 1 -
src/multiint.c | 9 ++++++++-
src/multiplay.c | 22 ++++++++++++++++------
4 files changed, 24 insertions(+), 9 deletions(-)
-------------------------
Commit: f5beafd27e1985b7179fefd78373243c050d1808
Author: Cyp <cy...@wz...>
Date: Mon Feb 22 22:41:56 2010 +0100
newnet: Synchronise build orders, against the will of whomever that wrote "//don't send BUILD orders in multiplayer".
Disarm the GAME_BUILD and GAME_BUILDFINISHED messages, which are now for synch only.
newnet.TODO | 12 ++++++++
src/drive.c | 2 +-
src/droid.c | 1 +
src/multibot.c | 82 +++++++++++++++++++++++++++++++++++++++++-----------
src/multiplay.c | 4 +-
src/multiplay.h | 4 +-
src/multistruct.c | 26 +++++++++--------
src/order.c | 26 +++++++++++++----
8 files changed, 116 insertions(+), 41 deletions(-)
-------------------------
Commit: 4cd5f7ee3e4d15786650e56c8247b3b1ca26a406
Author: Cyp <cy...@wz...>
Date: Mon Feb 22 23:17:10 2010 +0100
newnet: Synchronise GAME_STRUCTDEST and GAME_FEATUREDEST.
newnet.TODO | 5 +++++
src/feature.c | 1 +
src/multiplay.c | 4 ++--
src/structure.c | 1 +
4 files changed, 9 insertions(+), 2 deletions(-)
-------------------------
Commit: 75dc05226c3850639ab31240922cdf5eb810ee2c
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 00:23:12 2010 +0100
newnet: Remove some multiplayer hacks to stop droids from updating orders. Fix duplicate player names.
lib/netplay/netplay.c | 40 ++++++++++++++++++++++++++++++++++++++++
lib/netplay/netplay.h | 1 +
src/ai.c | 8 --------
src/order.c | 14 --------------
4 files changed, 41 insertions(+), 22 deletions(-)
-------------------------
Commit: c42c9a276a7da122a6fa93b44a4120c9ffaef4da
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 01:18:22 2010 +0100
newnet: Try to synch GAME_RESEARCHSTATUS and GAME_RESEARCH.
lib/netplay/netplay.c | 1 +
newnet.TODO | 6 ++++++
src/hci.c | 9 +++++++++
src/multiplay.c | 4 ++--
src/research.c | 9 ++++++++-
src/structure.c | 1 +
6 files changed, 27 insertions(+), 3 deletions(-)
-------------------------
Commit: 853d87580bc4efd58102605fb65c49403ea0920d
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 09:13:13 2010 +0100
newnet: Fix some selectedPlayer abuse.
lib/gamelib/gtime.c | 3 +--
newnet.TODO | 9 ++++++++-
src/combat.c | 2 +-
src/order.c | 34 ++++++++++++++++------------------
src/order.h | 2 +-
src/transporter.c | 2 +-
6 files changed, 28 insertions(+), 24 deletions(-)
-------------------------
Commit: de637f9a9994e2a80f4d16a874c6461b777a6737
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 09:58:19 2010 +0100
newnet: Fix research causing power desynch, and due to power usage being random, random number desynch as well.
newnet.TODO | 4 ++++
src/structure.c | 21 ++++++++-------------
2 files changed, 12 insertions(+), 13 deletions(-)
-------------------------
Commit: 073e367e20f6fe15c53ede68dc12c76df1589f86
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 15:04:31 2010 +0100
newnet: Synchronise production. Breaks the production queue somehow, needs fixing.
lib/netplay/netplay.c | 1 +
lib/netplay/netplay.h | 1 +
src/droid.c | 6 +---
src/multiint.c | 4 +++
src/multiplay.c | 3 ++
src/multiplay.h | 2 +-
src/multirecv.h | 1 +
src/multistruct.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
src/multisync.c | 5 ++++
src/structure.c | 28 +++++++++++------------
10 files changed, 89 insertions(+), 20 deletions(-)
-------------------------
Commit: 7eed990301d970c4280054b6ba49870e36fcb348
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 18:43:18 2010 +0100
newnet: Fix production queues.
Rename quantity variable which was used for two completely different things in a confusing manner. Disable stopping/resuming unsynchronised production and research.
newnet.TODO | 11 ++++-
src/droid.c | 5 +-
src/game.c | 6 +-
src/hci.c | 29 ++----------
src/hci.h | 2 -
src/intdisplay.c | 6 +-
src/map.c | 2 +-
src/multiplay.h | 2 +-
src/multistruct.c | 20 +++++----
src/research.c | 12 +++++
src/scriptfuncs.c | 7 +++-
src/structure.c | 122 +++++++++++++++++++++++++++------------------------
src/structure.h | 3 +-
src/structuredef.h | 3 +-
14 files changed, 120 insertions(+), 110 deletions(-)
-------------------------
Commit: 7a1f06efab787518d40fd6369724618b10614e7d
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 19:38:06 2010 +0100
newnet: Fix sending research, was some duplicate code left, which was causing synch errors.
src/multiplay.c | 24 ------------------------
1 files changed, 0 insertions(+), 24 deletions(-)
-------------------------
Commit: 48737800826dbbe8f4eb7c5844550782dedaffc7
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 19:46:04 2010 +0100
newnet: Fix small but fatal typo in line build.
src/order.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/order.c b/src/order.c
index 50d2c4a..9bd3083 100644
--- a/src/order.c
+++ b/src/order.c
@@ -2386,7 +2386,7 @@ void orderDroidStatsTwoLoc(DROID *psDroid, DROID_ORDER order, BASE_STATS *psStat
if (bMultiMessages)
{
- SendDroidInfo(psDroid, order, x1, y1, NULL, psStats, x2, x2);
+ SendDroidInfo(psDroid, order, x1, y1, NULL, psStats, x2, y2);
return; // Wait for our order before changing the droid.
}
-------------------------
Commit: c33ea0f8f4fe535dc5e1e2fba89153ecc0697e4a
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 21:38:16 2010 +0100
newnet: Synchronise GAME_GIFT and GAME_ALLIANCE.
src/multigifts.c | 115 ++++++++++++++++++++++++++++--------------------------
src/multiplay.c | 13 ++----
src/structure.c | 3 +-
3 files changed, 67 insertions(+), 64 deletions(-)
-------------------------
Commit: 757d1b84248a0637391bbcf67c85998ab7fbf8a1
Author: Cyp <cy...@wz...>
Date: Tue Feb 23 23:28:20 2010 +0100
newnet: Don't modify droid when queueing orders, and there are no orders to queue after.
src/order.c | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
-------------------------
Commit: 48faffd5438e964a6ab7d2c6a68ebe2d7a59ca47
Author: Cyp <cy...@wz...>
Date: Wed Feb 24 09:58:40 2010 +0100
newnet: Really synchronise GAME_GIFT and GAME_ALLIANCE.
src/multigifts.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
-------------------------
Commit: 69435aa87e66e5623de695c2f8932eb8cd8eeb39
Author: Cyp <cy...@wz...>
Date: Wed Feb 24 13:59:39 2010 +0100
newnet: Fix possible desynch on executing queued orders.
src/droid.c | 1 +
src/droiddef.h | 1 +
src/multibot.c | 2 +
src/multisync.c | 4 +++
src/order.c | 56 +++++++++++++++++++++++++++++-------------------------
5 files changed, 38 insertions(+), 26 deletions(-)
-------------------------
Commit: f7129d69ad9a5861c412be02204a0a11c27b079c
Author: Cyp <cy...@wz...>
Date: Wed Feb 24 15:07:21 2010 +0100
newnet: Remove SendDroidMove call which was causing desynch. Remove entire SendDroidMove and recvDroidMove functions, and GAME_DROIDMOVE, which are all no longer used.
Was possible to actually play one side of a whole Sk-Rush full-bases game, without going out of synch. (The other side was inactive, so it was a short game.)
lib/netplay/netplay.c | 5 +--
lib/netplay/netplay.h | 1 -
src/move.c | 8 -----
src/multibot.c | 85 -------------------------------------------------
src/multiplay.c | 5 +--
src/multiplay.h | 1 -
6 files changed, 3 insertions(+), 102 deletions(-)
-------------------------
Commit: 37b09601230f24466b84a7c28db1914788df1676
Author: Cyp <cy...@wz...>
Date: Wed Feb 24 20:07:56 2010 +0100
newnet: Reenable production/research starting/stopping, but synchronised.
lib/netplay/netplay.c | 2 +-
lib/netplay/netplay.h | 2 +-
src/multiplay.c | 4 +-
src/multiplay.h | 11 +++++++++-
src/multirecv.h | 2 +-
src/multistruct.c | 51 ++++++++++++++++++++++++++++--------------------
src/research.c | 5 +--
src/structure.c | 9 +++----
8 files changed, 51 insertions(+), 35 deletions(-)
-------------------------
Commit: 115146146b5b3d33982b2969b5f35988cd4779f9
Author: Cyp <cy...@wz...>
Date: Wed Feb 24 21:15:17 2010 +0100
newnet: Fix crash on setResearchStats getting NULL pointer.
The code is confusing...
src/hci.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
-------------------------
Commit: bfb9250937747394e2ced429c322528476f8d296
Author: Cyp <cy...@wz...>
Date: Thu Feb 25 13:35:00 2010 +0100
newnet: Send CRCs of syncDebug strings, not the strings themselves.
syncDebug should now be useful, even over a slow network.
lib/gamelib/gtime.c | 29 ++++++++++-
lib/netplay/netplay.c | 131 ++++++++++++++++++++++---------------------------
lib/netplay/netplay.h | 8 ++--
src/multiplay.c | 8 ++-
4 files changed, 94 insertions(+), 82 deletions(-)
-------------------------
Commit: 5c0d6f05ab9f2491ae0a8d8036b96be1e67e548d
Author: Cyp <cy...@wz...>
Date: Thu Feb 25 16:27:03 2010 +0100
newnet: Add some debugSync calls, so that if anything goes out of synch, it may be possible to figure out why.
src/droid.c | 18 ++++++++++++++++++
src/fpath.c | 25 ++++---------------------
src/random.cpp | 2 ++
src/structure.c | 23 +++++++++++++++++++++++
4 files changed, 47 insertions(+), 21 deletions(-)
-------------------------
Commit: 6a2560303247d47bd8c77919dae2c25c30289ce7
Author: Cyp <cy...@wz...>
Date: Thu Feb 25 17:27:09 2010 +0100
newnet: Fix power desynch on cancelling production. Make GAME_CHECK_POWER send a float, so it can actually recover from a power desynch.
lib/netplay/netplay.c | 4 +-
src/droid.c | 33 ++++++++++++------------
src/droid.h | 3 ++
src/multistruct.c | 4 +++
src/multisync.c | 14 +++++-----
src/structure.c | 66 ++++++++++++++++++++++++++-----------------------
src/structure.h | 3 ++
7 files changed, 71 insertions(+), 56 deletions(-)
-------------------------
Commit: cd7d35b757cbd2ed7658fc427206f23c22ddd48b
Author: Cyp <cy...@wz...>
Date: Thu Feb 25 20:46:27 2010 +0100
newnet: Make GAME_TEMPLATEDEST synchronised. Hope nothing explodes.
Wouldn't surprise me, if something exploded, though.
newnet.TODO | 6 +--
src/design.c | 6 ++-
src/droid.c | 102 +++++++++++++++++++++++++++++++++----------------------
src/droid.h | 1 +
src/multiplay.c | 13 ++++++-
5 files changed, 79 insertions(+), 49 deletions(-)
-------------------------
Commit: f0f5214a27570039c8e406a5d1ccde664ad5c108
Author: Cyp <cy...@wz...>
Date: Thu Feb 25 22:43:58 2010 +0100
newnet: Triple max droid limit, since the game is self-synchronised now.
src/multiplay.h | 3 +--
src/structure.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
-------------------------
Commit: e2eff7dfc9d86ce052e27857571ae46ede62d5f5
Author: Cyp <cy...@wz...>
Date: Fri Feb 26 13:03:29 2010 +0100
newnet: Don't wait for GAME_DROIDDEST or GAME_STRUCTDEST before destroying, since all players will do it at the same time, anyway.
GAME_DROIDDEST and GAME_STRUCTDEST are a bit redundant, now... (Except for debug mode use...)
lib/netplay/netplay.h | 4 ++--
newnet.TODO | 2 +-
src/droid.c | 3 +--
src/keybind.c | 8 ++++----
src/multibot.c | 4 ++--
src/multijoin.c | 2 +-
src/scriptfuncs.c | 4 ++--
src/structure.c | 2 +-
8 files changed, 14 insertions(+), 15 deletions(-)
-------------------------
Commit: 6d1727949fed0e5a7a05ea1b3d9d642f8f5a9697
Author: Cyp <cy...@wz...>
Date: Fri Feb 26 13:41:54 2010 +0100
newnet: Mark GAME_DEMOLISH done, since it had no effect on the game either way. Remove GAME_SECONDARY_ALL, which wasn't useful for anything.
lib/netplay/netplay.c | 15 +++++++--------
lib/netplay/netplay.h | 18 ++++++++++--------
newnet.TODO | 2 +-
src/multibot.c | 47 -----------------------------------------------
src/multiplay.c | 7 ++-----
src/multiplay.h | 1 -
src/multirecv.h | 1 -
src/multistruct.c | 1 +
src/structure.c | 5 -----
9 files changed, 21 insertions(+), 76 deletions(-)
-------------------------
Commit: e2067f447077480b1b656e6bbdef00f18f9d64fe
Author: Cyp <cy...@wz...>
Date: Fri Feb 26 14:00:15 2010 +0100
newnet: Don't helpfully "synchronise" the body points and position when sending/receiving GAME_SECONDARY.
src/multibot.c | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
-------------------------
Commit: f4bd5e257a1710cc8c09397fe1e79011572ae2ad
Author: Cyp <cy...@wz...>
Date: Fri Feb 26 14:18:03 2010 +0100
newnet: Remove GAME_VTOL, the VTOLs are happy without it.
lib/netplay/netplay.c | 1 -
lib/netplay/netplay.h | 1 -
src/multibot.c | 58 -------------------------------------------------
src/multiplay.c | 5 +---
src/multiplay.h | 1 -
src/multirecv.h | 1 -
src/structure.c | 5 ----
7 files changed, 1 insertions(+), 71 deletions(-)
-------------------------
Commit: 25b33c0fb326593d9c71a91f873c01f6ab55b1f4
Author: Cyp <cy...@wz...>
Date: Fri Feb 26 15:05:13 2010 +0100
newnet: Don't helpfully "synchronise" droids when sending/receiving GAME_GROUPORDER.
src/multibot.c | 31 -------------------------------
1 files changed, 0 insertions(+), 31 deletions(-)
-------------------------
Commit: 723cad56ed3ed6405ffdf5917ad457170cc7fb85
Author: Cyp <cy...@wz...>
Date: Fri Feb 26 15:43:37 2010 +0100
newnet: Make GAME_LASSAT synchronised.
newnet.TODO | 3 +++
src/hci.c | 17 +++++++++++++----
src/multiplay.c | 2 +-
src/order.c | 21 +++++++++++----------
4 files changed, 28 insertions(+), 15 deletions(-)
-------------------------
Commit: 6f4b9f515db8b1da12c27a16c39dcfeba599cf6e
Author: Cyp <cy...@wz...>
Date: Fri Feb 26 19:06:24 2010 +0100
newnet: Make DROID_EMBARK and DROID_DISEMBARK synchronised.
Make unloading cyborgs synchronised, but can only unload all at once, not one at a time...
lib/netplay/netplay.c | 8 ++++----
lib/netplay/netplay.h | 4 ++--
newnet.TODO | 9 ++++-----
src/mission.c | 2 +-
src/multibot.c | 7 ++++++-
src/multiplay.c | 4 ++--
src/order.c | 44 ++++++++++++++++++--------------------------
src/transporter.c | 9 +++++++++
8 files changed, 46 insertions(+), 41 deletions(-)
-------------------------
Commit: 94a555329a15ae9060f8654daa62aa4b9dc9e331
Author: Cyp <cy...@wz...>
Date: Fri Feb 26 21:51:47 2010 +0100
newnet: Make AI research synchronised. Games with AIs now seem to stay in synch.
newnet.TODO | 1 +
src/hci.c | 4 +-
src/multiplay.c | 2 +-
src/multiplay.h | 2 +-
src/research.c | 6 +-
src/scriptai.c | 39 +++++++++-------
src/scriptfuncs.c | 134 ++++++++--------------------------------------------
7 files changed, 51 insertions(+), 137 deletions(-)
-------------------------
Commit: 70d4c5fc92698240d117e6b95ec4c89588329509
Author: Cyp <cy...@wz...>
Date: Sat Feb 27 11:12:56 2010 +0100
newnet: When droids are taken over, don't send droid count, since droid count isn't read, making the message unparsable. Take over droids before waiting for the message (which makes the message redundant, anyway).
src/structure.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
-------------------------
Commit: 6f223ae8e743b0ac28e0a7e78edb370fe87cfb83
Author: Cyp <cy...@wz...>
Date: Sat Feb 27 22:15:58 2010 +0100
newnet: Fix crash on kicking, due to writing over constant string with itself in read-only memory.
lib/netplay/nettypes.cpp | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
-------------------------
Commit: 84275d52b0f6e1f53f365f03be6a55b1e2c95d20
Author: Cyp <cy...@wz...>
Date: Sat Feb 27 23:20:38 2010 +0100
newnet: Fix crash due to "forgetting" to pass a parameter to a function. Remove some ridiculous duplication of function declarations instead of including the headers.
lib/netplay/netplay.c | 20 +++++---------------
lib/netplay/netplay.h | 3 +++
src/multiint.c | 38 ++++++++------------------------------
src/multiint.h | 2 ++
4 files changed, 18 insertions(+), 45 deletions(-)
-------------------------
Commit: 7d396c951c70b2702126be1b18e9f89d8bc47077
Author: dak180 <da...@us...>
Date: Sun Feb 28 02:47:08 2010 +0000
Update the xcode project to work with newnet.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10044 4a71c877-e1ca-e34f-864e-861f7616d084
macosx/Warzone.xcodeproj/project.pbxproj | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
-------------------------
Commit: 153712cb5e7848d0bad66502266d6162af55b125
Author: Cyp <cy...@wz...>
Date: Fri Mar 5 19:09:32 2010 +0100
newnet: Clean up warnings, warning free build with -O2. Enable the same warnings for C and C++, where applicable.
configure.ac | 8 +++++---
lib/exceptionhandler/Makefile.am | 1 +
lib/exceptionhandler/exceptionhandler.c | 1 +
lib/framework/Makefile.am | 2 ++
lib/gamelib/Makefile.am | 2 ++
lib/iniparser/Makefile.am | 1 +
lib/ivis_common/Makefile.am | 1 +
lib/ivis_opengl/Makefile.am | 1 +
lib/netplay/Makefile.am | 1 +
lib/netplay/netplay.c | 10 +++++-----
lib/netplay/nettypes.cpp | 1 +
lib/script/Makefile.am | 2 ++
lib/sequence/Makefile.am | 1 +
lib/sound/Makefile.am | 1 +
lib/widget/Makefile.am | 1 +
src/Makefile.am | 2 ++
src/mapgrid.cpp | 2 +-
src/multisync.c | 2 +-
src/pointtree.h | 2 +-
19 files changed, 31 insertions(+), 11 deletions(-)
-------------------------
Commit: 6e3706aade1be3e6850cd0444f44b9402e9eeb2c
Author: Cyp <cy...@wz...>
Date: Fri Mar 5 19:57:17 2010 +0100
newnet: Move crcSum function to lib/framework, and use CRCs where appropriate.
Autogenerate trig tables again, but verify the table CRCs.
lib/framework/Makefile.am | 2 +
lib/framework/crc.cpp | 30 +++
lib/framework/crc.h | 18 ++
lib/framework/makefile.win32 | 1 +
lib/framework/trig.c | 451 +++---------------------------------------
lib/netplay/netplay.c | 21 +--
src/data.c | 79 ++------
7 files changed, 95 insertions(+), 507 deletions(-)
-------------------------
Commit: ae7e230f1ce66c43515fc2b486a04fb89565ce6f
Author: Cyp <cy...@wz...>
Date: Fri Mar 5 21:22:52 2010 +0100
newnet: Another warning squash for mac.
src/multisync.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/multisync.c b/src/multisync.c
index e9064ec..a4fea5b 100644
--- a/src/multisync.c
+++ b/src/multisync.c
@@ -145,7 +145,7 @@ BOOL sendCheck(void)
// pick a droid to send, NULL otherwise.
static DROID* pickADroid(void)
{
- DROID *pD, *ret;
+ DROID *pD, *ret = NULL; // ret: dummy initialisation.
unsigned player = MAX_PLAYERS;
unsigned i;
-------------------------
Commit: 5f7be1fb15e6f0cb4831557d84f1106a09f40af7
Author: dak180 <da...@us...>
Date: Fri Mar 5 20:51:30 2010 +0000
Add the crc.(cpp|h) files to the xcode project.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10160 4a71c877-e1ca-e34f-864e-861f7616d084
macosx/Warzone.xcodeproj/project.pbxproj | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
-------------------------
Commit: 71e12f031750ef69cbd793b32ea5ec8b02caa4e5
Author: Cyp <cy...@wz...>
Date: Fri Mar 5 22:28:59 2010 +0100
newnet: Use gameRand instead of rand when determining projectile trajectory.
D'oh... Not sure how that happened.
src/multisync.c | 8 ++++++++
src/projectile.c | 19 ++++++++++++++++++-
src/projectile.h | 3 +++
3 files changed, 29 insertions(+), 1 deletions(-)
-------------------------
Commit: cf7199179b15839b2d258331ab423151f589e556
Author: Cyp <cy...@wz...>
Date: Sat Mar 6 09:15:10 2010 +0100
newnet: Don't print NULL structure, don't assert on AI using order lists.
src/multisync.c | 2 +-
src/order.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-------------------------
Commit: cea90cc9c4b39adadb93ce0639dabee31bd082ed
Author: Cyp <cy...@wz...>
Date: Sat Mar 6 22:56:30 2010 +0100
newnet: Better alignment of structures with viewport.
src/display.c | 8 ++------
src/display3d.c | 12 ++++++++----
src/drive.c | 2 +-
src/droid.c | 2 +-
src/droiddef.h | 2 ++
src/hci.c | 20 +++++++-------------
src/multibot.c | 9 ++++++---
src/multiplay.h | 2 +-
src/order.c | 55 +++++++++++++++++++++++++++++--------------------------
src/order.h | 17 ++++++-----------
src/orderdef.h | 1 +
src/scriptai.c | 10 +++++-----
src/structure.c | 15 +++++++++++----
src/structure.h | 6 +++---
14 files changed, 83 insertions(+), 78 deletions(-)
-------------------------
Commit: ccb47562d585d9c8e8c5b7fc216177e0ebbd3f6f
Author: Cyp <cy...@wz...>
Date: Sun Mar 7 10:56:24 2010 +0100
newnet: Dump first 5 synch errors to files instead of dumping 1000s of lines per second to console.
lib/netplay/netplay.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++---
lib/netplay/netplay.h | 1 +
2 files changed, 63 insertions(+), 4 deletions(-)
-------------------------
Commit: d25559163407152fb7d72ff30cfa17d25edd1060
Author: Cyp <cy...@wz...>
Date: Sun Mar 7 12:20:47 2010 +0100
newnet: Disarm some droid build order synch code.
src/multistruct.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
-------------------------
Commit: 67a53b83563056ef18477088a3f6d5e7f7f70c20
Author: Cyp <cy...@wz...>
Date: Sun Mar 7 12:45:33 2010 +0100
newnet: Fix last commit, synch structure ids.
Still ugly to synchronise IDs this late.
src/multistruct.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/multistruct.c b/src/multistruct.c
index 6eb9965..682444b 100644
--- a/src/multistruct.c
+++ b/src/multistruct.c
@@ -171,13 +171,14 @@ BOOL recvBuildStarted(NETQUEUE queue)
psDroid->action = DACTION_BUILD;
}
}
+#endif
// Sync IDs
+ // TODO Synch IDs, without resorting to an ugly hack like this.
if (psDroid->psTarget)
{
((STRUCTURE *) psDroid->psTarget)->id = structId;
}
-#endif
}
return true;
-------------------------
Commit: 76827a7e78b29ce7847c4aae20491365950f9d88
Author: dak180 <da...@us...>
Date: Mon Mar 8 00:16:10 2010 +0000
Add -mfpmath=sse -msse3 to intel 32bit builds
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10200 4a71c877-e1ca-e34f-864e-861f7616d084
macosx/configs/Warzone-All.xcconfig | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
-------------------------
Commit: 674f2636c73bee87e18e5d80847527c7ad04cfe4
Author: Cyp <cy...@wz...>
Date: Tue Mar 9 19:40:43 2010 +0100
newnet: Add a couple more floating point sanity checks. Add -mno-fused-madd compile flag.
The tests were the same with and without -mno-fused-madd, but adding since multiply-add instructions have different rounding behaviour.
configure.ac | 19 +++++++++++++------
src/main.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 6 deletions(-)
-------------------------
Commit: b05f229416032b580595b3bd99e7f9f7eed3a520
Author: dak180 <da...@us...>
Date: Tue Mar 9 19:46:29 2010 +0000
Add -mno-fused-madd to the mac builds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10208 4a71c877-e1ca-e34f-864e-861f7616d084
macosx/configs/Warzone-All.xcconfig | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
-------------------------
Commit: 6fc229b3c2601fdbea3dcd60ca17f000cc85ce85
Author: Cyp <cy...@wz...>
Date: Thu Mar 11 17:25:53 2010 +0100
newnet: Remove popt from cross-compile scripts.
win32/libs/Makefile | 2 +-
win32/libs/popt/Makefile | 57 --------------------
.../popt/patches/001-crosscompile-configure.diff | 10 ----
3 files changed, 1 insertions(+), 68 deletions(-)
-------------------------
Commit: 7d23dc8d67257e4deb37aeb6ca08421275551573
Author: Cyp <cy...@wz...>
Date: Thu Mar 11 17:26:13 2010 +0100
newnet: Adjust latency automatically, instead of hardcoded to 400ms.
lib/gamelib/gtime.c | 71 +++++++++++++++++++++++++++++++++++++++++++++---
lib/netplay/netplay.c | 4 +-
2 files changed, 68 insertions(+), 7 deletions(-)
-------------------------
Commit: d2e6c0b6d17a171438bab1616c6622d585fb93a2
Author: Cyp <cy...@wz...>
Date: Fri Mar 12 00:26:14 2010 +0100
newnet: Call callback when factories finish building a droid.
AI scripts now seem to build more than just trucks.
src/droid.h | 1 +
src/multibot.c | 3 +++
src/structure.c | 5 ++---
src/structure.h | 2 ++
4 files changed, 8 insertions(+), 3 deletions(-)
-------------------------
Commit: 329721b1a2b4f154ef752d27cf70f4cef620fd96
Author: Cyp <cy...@wz...>
Date: Fri Mar 12 11:31:44 2010 +0100
newnet: Fix crash on desynch, when synchronising structures that haven't been built yet. Move desynch logs to logs/.
lib/netplay/netplay.c | 2 +-
src/multisync.c | 18 +++++++++++++-----
2 files changed, 14 insertions(+), 6 deletions(-)
-------------------------
Commit: 77868ad9e581cafc77b90f2dde77391aa0d0cb23
Author: Cyp <cy...@wz...>
Date: Fri Mar 12 13:46:28 2010 +0100
newnet: Make scrCompleteResearch and research all synchronised.
Making scrCompleteResearch synchronised fixes a synch error when a human player gives a droid to another human player, since the AIs then of course call scrCompleteResearch for research type 393.
src/keybind.c | 22 +++++++++++++++++++---
src/multigifts.c | 2 ++
src/multiplay.c | 5 +++++
src/power.c | 23 +++++++++++++++++++++++
src/scriptfuncs.c | 10 ++++++----
5 files changed, 55 insertions(+), 7 deletions(-)
-------------------------
Commit: b2a73377e69d0fbc010b88b4650684da8acee9cc
Author: Cyp <cy...@wz...>
Date: Sat Mar 13 00:07:57 2010 +0100
newnet: Avoid using the double type.
src/wavecast.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-------------------------
Commit: 8653631374e290c5ce59cd50922e4444f35c1d3c
Author: Cyp <cy...@wz...>
Date: Sat Mar 13 23:14:47 2010 +0100
src: Undo a warning squelch, seems to be able to cause build errors for some, somehow.
lib/framework/Makefile.am | 2 +-
lib/gamelib/Makefile.am | 2 +-
lib/script/Makefile.am | 2 +-
src/Makefile.am | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
-------------------------
Commit: 9afa507ef03a46a2486bdac177ae7d73147b1394
Author: Cyp <cy...@wz...>
Date: Sat Mar 13 23:57:11 2010 +0100
newnet: Remove leftover stray syncDebugBacktrace() call.
(They cause false alarms if the binary isn't identical.)
src/power.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/power.c b/src/power.c
index 9c37c4c..95ce6cd 100644
--- a/src/power.c
+++ b/src/power.c
@@ -167,7 +167,6 @@ void usePower(int player, float quantity)
{
ASSERT_OR_RETURN(, player < MAX_PLAYERS, "Bad player (%d)", player);
syncDebug("usePower%d %f-=%f", player, asPower[player].currentPower, quantity);
- syncDebugBacktrace();
asPower[player].currentPower = MAX(0, asPower[player].currentPower - quantity);
}
-------------------------
Commit: a2f7e46f4f686ab1edfa1c973fac5b79ac0af0e4
Author: Cyp <cy...@wz...>
Date: Sun Mar 14 13:23:58 2010 +0100
newnet: Remove debugSync from checkPower, which doesn't change game state. Don't require power in edit menu.
src/hci.c | 4 +++-
src/power.c | 3 ---
src/power.h | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
-------------------------
Commit: 239e4e450d5086e1db76520d9e6e5f860561072d
Author: Cyp <cy...@wz...>
Date: Sun Mar 14 13:27:05 2010 +0100
newnet: Display icon on desynch or on waiting for players.
Saves having to look at console output to check that the game is in synch.
data/base/images/intfac.img | 4 +
data/base/images/intfac5.png | Bin 9187 -> 8804 bytes
lib/gamelib/gtime.c | 3 +
lib/netplay/netplay.c | 3 +-
lib/netplay/netplay.h | 10 +++
src/display3d.c | 165 +++++++++++++++++++++++++++---------------
src/intfac.h | 6 ++-
src/multiint.c | 1 -
8 files changed, 128 insertions(+), 64 deletions(-)
-------------------------
Commit: ab7b1f9eddfa08f49af85fa27ef686f67e612b71
Author: Cyp <cy...@wz...>
Date: Sun Mar 14 20:07:02 2010 +0100
newnet: Do a msvc-compatible dummy-initialisation, to make both msvc and mac happy at the same time. Remove unused structureCheckLastCapacity.
src/multisync.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
-------------------------
Commit: 952a37308dc0c2996fcfba48b27bf9761e4380b9
Author: Cyp <cy...@wz...>
Date: Sun Mar 14 20:09:24 2010 +0100
newnet: Fix last commit, now it actually compiles.
src/multisync.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/multisync.c b/src/multisync.c
index 603268b..8ae5219 100644
--- a/src/multisync.c
+++ b/src/multisync.c
@@ -264,7 +264,7 @@ static BOOL sendDroidCheck(void)
static PACKAGED_CHECK packageCheck(const DROID *pD)
{
PACKAGED_CHECK pc;
- memset(pc, 0xFF, sizeof(pc)); // Dummy initialisation.
+ memset(&pc, 0xFF, sizeof(pc)); // Dummy initialisation.
pc.gameTime = gameTime + MIN_DELAY_BETWEEN_DROID_SYNCHS;
pc.player = pD->player;
-------------------------
Commit: 66edd6bdb37a483b935b64e2f607bf9eef0f5116
Author: Buginator <bug...@gn...>
Date: Sun Mar 14 19:32:12 2010 +0000
Update MSVC project files to compile newnet
Added /arch:sse2
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10283 4a71c877-e1ca-e34f-864e-861f7616d084
lib/framework/framework.vcproj | 9 +++++++++
lib/gamelib/gamelib.vcproj | 1 +
lib/iniparser/iniparser.vcproj | 1 +
lib/ivis_common/ivis_common.vcproj | 1 +
lib/ivis_opengl/ivis_opengl.vcproj | 1 +
lib/netplay/netplay.vcproj | 25 ++++++++++++++++++++++++-
lib/script/script.vcproj | 1 +
lib/sequence/sequence.vcproj | 1 +
lib/sound/sound.vcproj | 2 +-
lib/widget/widget.vcproj | 2 +-
win32/Warzone2100.vcproj | 1 +
11 files changed, 42 insertions(+), 3 deletions(-)
-------------------------
Commit: 468f3936cbb4a97f78367807edcf69f998522902
Author: Cyp <cy...@wz...>
Date: Sun Mar 14 20:53:00 2010 +0100
newnet: Assert on broken float primitive datatype.
src/main.c | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
-------------------------
Commit: 8c7a25e6663c59fe9d3f1d7dd6d11f4f10d7c7b7
Author: Cyp <cy...@wz...>
Date: Sun Mar 14 20:58:44 2010 +0100
newnet: Don't syncDebug floats directly.
Needed due to different sprintf implentations.
lib/netplay/netplay.c | 12 ++++++++++++
lib/netplay/netplay.h | 1 +
src/droid.c | 4 ++--
src/multisync.c | 2 +-
src/power.c | 25 +++++++++----------------
src/structure.c | 4 ++--
6 files changed, 27 insertions(+), 21 deletions(-)
-------------------------
Commit: f6ca9df680349dd1582de6b4381aabfdf745a730
Author: Cyp <cy...@wz...>
Date: Sun Mar 14 22:13:12 2010 +0100
newnet: Add floating point consistency flags to icc build.
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
-------------------------
Commit: 9b17059e109667b65ff30983082369eb6b7ce3d2
Author: Cyp <cy...@wz...>
Date: Wed Mar 17 14:43:29 2010 +0100
newnet: Don't resort to sorting pointer addresses, if two objects are in exactly the same place.
src/pointtree.cpp | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
-------------------------
Commit: fd36d0e9610cbdfec382450a20c8bf9b9fbc907c
Author: dak180 <da...@us...>
Date: Wed Mar 17 19:22:09 2010 +0000
Fix the NN project file.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10339 4a71c877-e1ca-e34f-864e-861f7616d084
macosx/Warzone.xcodeproj/project.pbxproj | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
-------------------------
Commit: 35995c8c27627a09460c716c98a36e1b08ac2523
Author: Safety0ff <saf...@us...>
Date: Sun May 16 01:26:33 2010 +0000
obj2pie:
- Add PIE 3 support.
- Add tcmask pie type option.
- Fix rounding of PIE 2 texture coordinates.
- Tolerate vertex normals.
- Use duplicate faces instead of deprecated flag.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10812 4a71c877-e1ca-e34f-864e-861f7616d084
tools/conversion/obj2pie.c | 218 +++++++++++++++++++++++++++++---------------
1 files changed, 146 insertions(+), 72 deletions(-)
-------------------------
Commit: a684e0c9adec181fc431f5f153ba5c9055418746
Author: dak180 <da...@us...>
Date: Sun May 16 02:13:50 2010 +0000
Require native execution because otherwise wz gets confused.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10822 4a71c877-e1ca-e34f-864e-861f7616d084
macosx/Resources/Warzone-Info.plist | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
-------------------------
Commit: 9b172cf0ef322142e99398baf363df8d22d10a58
Author: René Jürgens <del...@gn...>
Date: Sun May 16 11:44:46 2010 +0000
a trunk .wrf update
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10833 4a71c877-e1ca-e34f-864e-861f7616d084
.../multiplay/ntw/components/weapons/mine_vis.pie | 34 ++++++++++++++++++++
.../multiplay/ntw/components/weapons/minevis.pie | 34 --------------------
data/mods/multiplay/ntw/stats/features.txt | 2 +-
data/mods/multiplay/ntw/stats/structures.txt | 16 +++++-----
data/mods/multiplay/ntw/wrf/vidmem.wrf | 8 +++++
data/mods/multiplay/ntw/wrf/vidmem2.wrf | 6 +++
data/mods/multiplay/ntw/wrf/vidmem3.wrf | 12 +++++++
data/mods/multiplay/ntw/wrf/vidmemc.wrf | 1 +
8 files changed, 70 insertions(+), 43 deletions(-)
-------------------------
Commit: 55e2bce2d16ed686c1e736ece66fa4f7674a800e
Author: Per Inge Mathisen <pe...@wz...>
Date: Mon May 17 16:39:41 2010 +0000
semperfi: Construct VTOL droid templates dynamically based on available components
instead of using prefabricated VTOL templates. This is more flexible.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10839 4a71c877-e1ca-e34f-864e-861f7616d084
.../multiplay/semperfi/multiplay/skirmish/ai.slo | 117 ++++++++++++++++---
.../multiplay/semperfi/multiplay/skirmish/ai.vlo | 50 ++++++---
2 files changed, 134 insertions(+), 33 deletions(-)
-------------------------
Commit: 6c633359f109f5abb12c742880670c26a343ee54
Author: Per Inge Mathisen <pe...@wz...>
Date: Mon May 17 17:14:24 2010 +0000
semperfi: When the enemy has no AA (that we can see), build the cheapest VTOL bodies available.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10840 4a71c877-e1ca-e34f-864e-861f7616d084
.../multiplay/semperfi/multiplay/skirmish/ai.slo | 33 +++++++++++++++++--
1 files changed, 29 insertions(+), 4 deletions(-)
-------------------------
Commit: 59b5478d836640f77470aacc6f908d1efd9a88ce
Author: Per Inge Mathisen <pe...@wz...>
Date: Mon May 17 17:52:55 2010 +0000
Add new trigger CALL_VTOL_RETARGET that is fired off whenever a VTOL detects that its
designated target no longer exists. This allows an AI script to give it a new target
while in-flight instead of waiting for it to return to base, saving precious time.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10841 4a71c877-e1ca-e34f-864e-861f7616d084
src/order.c | 13 ++++++++++---
src/scriptcb.c | 31 +++++++++++++++++++++++++++++++
src/scriptcb.h | 4 ++++
src/scripttabs.c | 7 +++++--
src/scripttabs.h | 1 +
5 files changed, 51 insertions(+), 5 deletions(-)
-------------------------
Commit: f2bdbdb407c879ee40d62025548bcfa9be7dacb1
Author: Per Inge Mathisen <pe...@wz...>
Date: Mon May 17 17:53:29 2010 +0000
semperfi: Utilize CALL_VTOL_RETARGET to make VTOLs more effective.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10842 4a71c877-e1ca-e34f-864e-861f7616d084
.../multiplay/semperfi/multiplay/skirmish/ai.slo | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
-------------------------
Commit: 843d000dab5f13caf4bb7a9160f65401478dc5b8
Author: Per Inge Mathisen <pe...@wz...>
Date: Mon May 17 19:38:12 2010 +0000
Fix crazy indentation and add an extra assert to try to figure out why psSelectedFactory
can be assigned to a non-factory type building.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10843 4a71c877-e1ca-e34f-864e-861f7616d084
src/intorder.c | 409 ++++++++++++++++++++++++++------------------------------
1 files changed, 191 insertions(+), 218 deletions(-)
-------------------------
Commit: e3ec5983c6e565a694d43cafcef729695787098a
Author: Per Inge Mathisen <pe...@wz...>
Date: Mon May 17 19:40:50 2010 +0000
semperfi: Add fallback for cases when we don't have tech for some VTOL types. Stop rallying
ground defenders to protect against VTOL attacks - they just get fried by firebombs. Start
protecting properly against human attacks (no reason to treat humans special).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10844 4a71c877-e1ca-e34f-864e-861f7616d084
.../multiplay/semperfi/multiplay/skirmish/ai.slo | 39 ++++++++++++--------
.../multiplay/semperfi/multiplay/skirmish/ai.vlo | 2 +-
2 files changed, 24 insertions(+), 17 deletions(-)
-------------------------
Commit: 511edb05a724eadd165a36df5a0ca11350020362
Author: Per Inge Mathisen <pe...@wz...>
Date: Mon May 17 21:28:08 2010 +0000
New cheat command 'reload me' to immediately prepare selected Laser Satellite building for fire.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10845 4a71c877-e1ca-e34f-864e-861f7616d084
src/cheat.c | 1 +
src/keybind.c | 26 ++++++++++++++++++++++++++
src/keybind.h | 1 +
3 files changed, 28 insertions(+), 0 deletions(-)
-------------------------
Commit: b3ce6cd49f5d65201135d5b490bb41d26a9763de
Author: Per Inge Mathisen <pe...@wz...>
Date: Tue May 18 21:02:58 2010 +0000
Fix hover droids getting stuck in water tiles near land tiles.
This closes ticket:1854 and implements part of ticket:1649
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10850 4a71c877-e1ca-e34f-864e-861f7616d084
src/formation.c | 2 +-
src/fpath.c | 14 ++++++--------
src/fpath.h | 2 +-
src/move.c | 4 ++--
4 files changed, 10 insertions(+), 12 deletions(-)
-------------------------
Commit: 57ea09304873b203e524b609c1c823e080511005
Author: Per Inge Mathisen <pe...@wz...>
Date: Tue May 18 21:09:58 2010 +0000
Clean up previous commit by using the proper getPropulsionStats() accessor function.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10851 4a71c877-e1ca-e34f-864e-861f7616d084
src/fpath.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
-------------------------
Commit: 3848710d3ca5648b5d63c8b36c4cc7f4de3edfb0
Author: Per Inge Mathisen <pe...@wz...>
Date: Wed May 19 20:23:32 2010 +0000
Remove floating point move precision - first pass. Add higher int precision than usual
in the movement code. See ticket:1651 for discussion.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10853 4a71c877-e1ca-e34f-864e-861f7616d084
src/droid.c | 11 +-----
src/game.c | 19 ++---------
src/map.c | 93 -------------------------------------------------------
src/move.c | 85 +++++++++++++-------------------------------------
src/movedef.h | 4 --
src/multisync.c | 54 ++++++++++++++------------------
6 files changed, 51 insertions(+), 215 deletions(-)
-------------------------
Commit: 579fd2970dd46c2374bb3406ae392645aaa53daa
Author: Per Inge Mathisen <pe...@wz...>
Date: Thu May 20 15:56:00 2010 +0000
Merge in some changes from semperfi into standard AI: New debug functions. More fallbacks if forward defenses fail.
Remove non-working anti-dupe-sensor hack. Remove hack that prevents AI from defending properly against humans only.
Add more sanity checking.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10856 4a71c877-e1ca-e34f-864e-861f7616d084
data/base/multiplay/skirmish/ai.slo | 84 ++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 36 deletions(-)
-------------------------
Commit: 541df6442dbcc302c30eb744d73d262d42126f06
Author: Per Inge Mathisen <pe...@wz...>
Date: Thu May 20 18:38:07 2010 +0000
Add new functionality list for all oil resource/derrick objects for quick iteration
of them. This is intended to be accessed from scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10857 4a71c877-e1ca-e34f-864e-861f7616d084
src/feature.c | 6 ++----
src/game.c | 3 +++
src/mission.c | 8 ++++++++
src/missiondef.h | 1 +
src/objmem.c | 28 +++++++++++++++++++++++++---
src/objmem.h | 1 +
6 files changed, 40 insertions(+), 7 deletions(-)
-------------------------
Commit: a5cb039c08eb49f81d44a345f47bc625fbc3ea21
Author: Per Inge Mathisen <pe...@wz...>
Date: Thu May 20 20:50:47 2010 +0000
I managed to fix up the parameters for ASSERT_OR_RETURN. Closes ticket:1862 - right clicking factory causes crash.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10858 4a71c877-e1ca-e34f-864e-861f7616d084
src/intorder.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
-------------------------
Commit: 4f5775a15f258cb74abd4fb5e93ecaf854dcf418
Author: Per Inge Mathisen <pe...@wz...>
Date: Thu May 20 21:02:05 2010 +0000
semperfi: Add AA to research list. Really necessary now!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10859 4a71c877-e1ca-e34f-864e-861f7616d084
.../multiplay/semperfi/multiplay/skirmish/ai.vlo | 23 ++++++++++---------
1 files changed, 12 insertions(+), 11 deletions(-)
-------------------------
Commit: 34906545025802981766ba5927ba1634ac78ecf4
Author: Per Inge Mathisen <pe...@wz...>
Date: Thu May 20 21:15:39 2010 +0000
semperfi: Merge much of the differences between the tech branches back together to make them easier
manage dynamically and also create more of them in the future.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/...
[truncated message content] |