Changeset 1d0ede1 in network-game

Timestamp:

Jun 17, 2013, 2:27:26 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

c76134b

Parents:

7c52498 (diff), 88c0536 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/network-game

File:

• common/Player.cpp (modified) (2 diffs)

common/Player.cpp

@@ -144 +144 @@
    memcpy(buffer+46, &this->range, 4);
 
-   strcpy(buffer+46, this->name.c_str());
+   strcpy(buffer+50, this->name.c_str());
 }
 
@@ -165 +165 @@
    memcpy(&this->range, buffer+46, 4);
 
-   this->name.assign(buffer+46);
+   this->name.assign(buffer+50);
 }