diff options
| author | Fabian Greffrath | 2015-03-26 16:31:57 +0100 |
|---|---|---|
| committer | Fabian Greffrath | 2015-03-26 16:31:57 +0100 |
| commit | 27b5915111ffbdae97ce0c415157e104ee6f3493 (patch) | |
| tree | 850fc62208b642b07047e0a9ea968c365d4dfd1f /src/net_client.c | |
| parent | 350ac122030d198b187255b19b2519ef8267364a (diff) | |
| parent | ad027ef6dbfeebabe0e6701eec968e9d474e497f (diff) | |
| download | chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.gz chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.bz2 chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.zip | |
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
Diffstat (limited to 'src/net_client.c')
| -rw-r--r-- | src/net_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net_client.c b/src/net_client.c index 54903dae..ac81e367 100644 --- a/src/net_client.c +++ b/src/net_client.c @@ -279,8 +279,8 @@ static void NET_CL_AdvanceWindow(void) // Advance the window - memcpy(recvwindow, recvwindow + 1, - sizeof(net_server_recv_t) * (BACKUPTICS - 1)); + memmove(recvwindow, recvwindow + 1, + sizeof(net_server_recv_t) * (BACKUPTICS - 1)); memset(&recvwindow[BACKUPTICS-1], 0, sizeof(net_server_recv_t)); ++recvwindow_start; @@ -1102,5 +1102,5 @@ void NET_Init(void) void NET_BindVariables(void) { - M_BindVariable("player_name", &net_player_name); + M_BindStringVariable("player_name", &net_player_name); } |