Merge remote-tracking branch 'origin/SQC-15_animation' into SQC-15_paquets
This commit is contained in:
		| @@ -106,7 +106,11 @@ namespace netprot { | ||||
| 		uint64_t id = 0, | ||||
| 				 tid = 0; | ||||
| 		PlayerInfo() {} | ||||
| 		PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) { strcpy(log->name, name); } | ||||
| 		PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) { | ||||
| 			strcpy(log->name, name); | ||||
| 		}; | ||||
| 		PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { memcpy((void*)strname.c_str(), name, strname.length()); | ||||
| 		} | ||||
| 	}; | ||||
|  | ||||
| 	struct GameInfo {									// cli <-> srv			TCP			event (before game start)/ once | ||||
|   | ||||
		Reference in New Issue
	
	Block a user