00c92cbdd7
Fix bug introduced in 09ea0be7c30236809536db332be78b2967d3114d Changelog: Fix kicking of non-hosts who didn't have default color values.
...
Only change colors if you are the host on the setup screen.
Fixes ticket:2329
(cherry picked from commit fd2843e6431e43cc72b635c422fd18bb19d42c47)
Conflicts:
lib/netplay/netplay.c
2010-12-06 21:13:54 -05:00
0049223ccb
Use the host's SP color as the default color when hosting games. (cherry picked from commit 09ea0be7c30236809536db332be78b2967d3114d)
...
Conflicts:
lib/netplay/netplay.c
2010-12-06 21:13:52 -05:00
bf38eb51ea
Add branch switching hack to remaining Makefile.am files.
2010-12-06 00:19:30 +01:00
2ad6ff0855
Fix desynch when player leaves, due to clearing buildings at different gameTimes.
2010-11-29 12:48:51 +01:00
a8f6faaed0
Fix spurious desynch at gameTime 102, due to not clearing desynch logs between games.
...
Also, no need to duplicate function name strings, which are link-time constants.
2010-11-29 01:45:19 +01:00
83f1a892e1
Only clear player name when needed.
...
(When player drops / leaves, you will still see their name instead of the default color name).
Also fix a log line.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11495 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 847edec81737e6c6a42e4c91aede5c99b9a755ce)
2010-11-22 16:06:29 +01:00
3359fac395
Fix broken moveCalcBlockingSlide comparisons, and make DEG(42) evaluate to 7645 without use of floating point.
...
After making DEG avoid using float (unless given a float argument), had to fix moveCalcBlockingSlide to avoid out-of-range-comparison error-warnings.
The moveCalcBlockingSlide's int16_t instead of uint16_t was introduced in 6c811c1ecb
2010-11-16 18:33:20 +01:00
a0c1c9de0d
Change droid experience from float to uint32_t.
...
Less floats generally reduces the risk of desynchs, don't know if the droid experience caused desynchs, but it might have been possible. Added experience to syncDebugDroid.
Also, fixed QualityFactor and droidResistance integer truncation and made single-player skirmish damage not affected by difficulty level either.
2010-11-16 14:18:01 +01:00
7df59bafdb
Fix desynch when constructing and demolishing the same structure at the same time.
2010-11-15 14:31:28 +01:00
df83ed0caa
Bump netcode's NETCODE_VERSION_MINOR to sync with new testing build.
2010-11-14 22:38:20 -05:00
be5285f916
Fix duplicate structure IDs by removing GAME_BUILD message type.
...
The only remaining purpose of GAME_BUILD was to hackishly change structure IDs around, which is not useful since structure IDs are already synchronised.
Changelog: Fix inability to select or target some structures due to duplicate structure IDs.
2010-11-07 14:16:56 +01:00
0702fa9eb5
Show map / game name / hosted by in the tooltip for the lobby
...
closes ticket:2121
This does *NOT* break GAMESTRUCT compatibility.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11546 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 1119dada6868433f6840dd1fe174a7aa3858b081)
2010-11-02 15:30:36 +01:00
33c25602f7
Bump netcode version.
2010-10-30 22:59:27 +02:00
d41a6078d4
Bump netcode version for testing build.
2010-10-30 22:57:54 +02:00
ad4a38a1be
Bump netcode version.
...
Also, remove unused NETCODE_HASH.
2010-10-26 10:11:04 +02:00
e8ebb11d4a
Remove NETnull() function, which was potentially confusing.
...
NETnull() was equivalent to uint32_t zero = 0; NETuint32_t(&zero);, which no longer adds/removes 4 bytes of padding as advertised.
2010-10-23 18:02:56 +02:00
7ab97781ae
Print the needed port when lobby communication fails.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11639 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-13 10:49:13 +02:00
559ded3ec0
Fix switching players in single-player mode in debug menu.
2010-09-01 21:34:21 +02:00
6f60e686ae
Remove NETuint32_tSmall, make all uint32_t's small, except for one uint32_tLarge.
...
(The large is a CRC, and CRCs are usually large numbers.)
2010-08-15 21:02:32 +02:00
438a4d5aff
Enable warnings, make warnings consistent, fix some warnings, use -Wno-error=squeak to allow squeaky warnings to compile without squelching them.
2010-08-15 12:30:46 +02:00
26fa2b06f9
Change back to "trunk" form newnet. (less confusion)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11470 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 00:10:52 +02:00
7d5f1271a9
Merge remote branch 'origin/master' into newnet
...
Conflicts:
.gitignore
lib/iniparser/Makefile.am
macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
2010-08-14 11:26:09 +02:00
fcd0b6fe46
Print "Oldname → Newname" instead of "Oldname: -> Newname".
2010-08-14 09:58:36 +02:00
18307a7fc1
Eschew ventriloquism assiduously.
2010-08-14 09:57:45 +02:00
fab89b8ab4
Don't crash in socketAccept when given a NULL socket.
...
Closes #2033 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11405 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-09 09:14:50 +02:00
dd47d1f8c2
newnet: Insist harder on detecting and displaying desynchs.
2010-08-02 14:22:10 +02:00
d5b3621844
Merge branch 'master' into newnet
...
Conflicts:
lib/netplay/netplay.c
src/multiint.c
2010-08-01 21:10:34 +02:00
7c8df3a2e8
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/framework/wzapp_c.h
src/power.c
src/power.h
2010-08-01 20:41:45 +02:00
82ad8abd8f
When a player drops from the joining menu, clients should remove the dropped player, and not decide whether to randomly quit based on whatever was on the stack, either. (Forward-port from 2.3.)
2010-08-01 19:41:07 +02:00
da7ff2f37f
Don't allow inconsistent player positions or colours, even momentarily. (Forward-port from 2.3.)
...
On swapping places or colours, sends a NET_PLAYER_INFO containing both players, instead of two separate NET_PLAYER_INFOs.
2010-08-01 19:40:12 +02:00
7874dc608c
Clean up thread-related #defines. (Backport from newnet.)
2010-08-01 15:23:06 +02:00
2e01e81da6
newnet: Show relevant players next to connection status icons.
2010-08-01 13:06:50 +02:00
b59b089ca5
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/nettypes.c
src/multibot.c
2010-07-30 22:51:33 +02:00
edb644a03b
Fix (and add missing) headers to files.
...
2009 Warzone Resurrection Project -> 2010 Warzone 2100 Project
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11298 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:33 +02:00
1db4f15973
Change do-while to while, since it doesn't make sense to try to read a game structure when there are none in the lobby.
2010-07-22 19:19:53 +02:00
1b811abcea
Before receiving game list from server, clear old games from list, and don't receive more than there are room for in the array.
2010-07-22 14:45:49 +02:00
e246e6006e
newnet: Save a few more bytes.
2010-07-20 15:40:07 +02:00
212115faed
newnet: Delay writing NET_SHARE_GAME_QUEUE until flush.
2010-07-17 11:49:55 +02:00
ee1ae86ea7
newnet: Use Z_PARTIAL_FLUSH instead of Z_SYNC_FLUSH to save a few bytes.
...
They do the same thing, except that Z_SYNC_FLUSH adds a bit of useless padding.
2010-07-17 02:01:08 +02:00
b704a741bf
newnet: Don't poll sockets, if there is already data ready in the socket decompression state.
...
Should avoid freezing with everyone waiting for players.
2010-07-17 01:00:55 +02:00
c1ca4d2d34
newnet: Don't send lots of small packets, fix "connection error"s when listing games.
...
Since there is no advantage in sending data more than once per game tick, queue up data until the game time ticks. This may result in sligtly better compression in some cases, due to not flushing non-stop.
Don't close a socket while data is queued to be sent, since this sometimes breaks listing games (where the list is queued, and the socket is closed).
2010-07-16 21:46:00 +02:00
8e93542537
newnet: Don't assume disconnect when no data results from decompressing, unless really disconnected.
2010-07-16 18:02:37 +02:00
cd274fcc3e
newnet: Add mysterious (char *) cast to fix windows build.
2010-07-14 00:36:59 +02:00
695a2b35ae
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/netplay.c
2010-07-13 20:50:37 +02:00
9b04e261c6
newnet: Use zlib compression on sockets. Should save a few bytes.
2010-07-13 16:15:53 +02:00
6239cbaf46
Bump revision number for netcode, since the addition of r11182 (the map) it would fubar if all clients are not the same, and host was using said map.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11185 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-13 11:30:56 +02:00
096c257052
Commit these project settings defines to disable extra checking which causes a huge performance hit. (VS2k8 was already committed in r9639, this was forgotten.)
...
_HAS_ITERATOR_DEBUGGING=0
http://msdn.microsoft.com/en-us/library/aa985939(VS.80).aspx
_SECURE_SCL=0
http://msdn.microsoft.com/en-us/library/aa985896(VS.80).aspx
For more info on checked iterators see:
http://msdn.microsoft.com/en-us/library/aa985965(v=VS.80).aspx
and
http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11184 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-13 11:30:56 +02:00
b9a051150b
newnet: Clean up thread-related #defines.
2010-07-12 17:57:35 +02:00
f0beca71cc
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/netlog.c
lib/netplay/netlog.h
lib/netplay/netplay.c
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
macosx/configs/Warzone-Debug.xcconfig
src/multijoin.c
2010-07-10 17:02:39 +02:00
a8558300c2
newnet: Remove GAME_GROUPORDER, use GAME_DROIDINFO instead.
...
Since GAME_DROIDINFO groups orders now, anyway. Removes ~200 lines code duplication.
2010-07-10 16:56:09 +02:00
buginator
Cyp
Christian Ohm