memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/SQC-15_animation' into SQC-15_paquets

Browse Source
This commit is contained in:
MarcEricMartel
2023-11-13 17:02:39 -05:00
parent bb810ba1c1 dfd2ddc8af
commit e011e2f1fc
6 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SQCSim-common/netprotocol.h
View File

@@ -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

3
SQCSim-common/player.h
View File

@@ -5,6 +5,7 @@
#include "transformation.h"
#include "vector3.h"
class World;
class Player {
@@ -51,6 +52,8 @@ protected:
bool m_airborne;
Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
};