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

pouet pouet

Browse Source
This commit is contained in:
MarcEricMartel 2023-10-30 15:36:43 -04:00
parent 3249d68e60
commit 35c2a5be31
3 changed files with 96 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SQCSim-common/netprotocol.cpp
View File

@ -812,7 +812,6 @@ std::vector<netprot::Packet> netprot::recvPacks(SOCKET sock, Buffer* buf) {
std::vector<Packet> lsPck; std::vector<Packet> lsPck;
int len = 0, end = 0; int len = 0, end = 0;
bool pck_received = false; bool pck_received = false;
char* cursor = nullptr;
while (true) { while (true) {
while (!pck_received) { while (!pck_received) {
@ -823,21 +822,27 @@ std::vector<netprot::Packet> netprot::recvPacks(SOCKET sock, Buffer* buf) {
// TODO: Voir si on trouve un footer (5 '\0' d'affilee). // TODO: Voir si on trouve un footer (5 '\0' d'affilee).
// Si oui, mettre l'index du debut du footer dans // Si oui, mettre l'index du debut du footer dans
// la variable "end" et mettre pck_received a true. // la variable "end" et mettre pck_received a true.
//buf->ptr
//end = len;
//pck_received = true;
} }
char* cursor = nullptr;
cursor = &buf->ptr[end]; cursor = &buf->ptr[end];
lsPck.push_back(getPack(buf)); lsPck.push_back(getPack(buf));
while (*cursor == '\0') { while (*cursor == '\0')
cursor++; cursor++, end++;
end++;
}
if (cursor) { // mettre le début du prochain paquet au début du buffer. if (cursor) { // mettre le début du prochain paquet au début du buffer.
memcpy(buf->ptr, cursor, buf->len - end); // et voir s'il y a en un autre memcpy(buf->ptr, cursor, buf->len - end); // et voir s'il y a en un autre
len = 0; len = 0;
pck_received = true; pck_received = false;
} }
} }
} }

8
SQCSim2021/engine.cpp
View File

@ -280,7 +280,6 @@ void Engine::Init() {
} }
uint64_t seed = SEED; uint64_t seed = SEED;
char ch;
glDisable(GL_FRAMEBUFFER_SRGB); glDisable(GL_FRAMEBUFFER_SRGB);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
@ -314,11 +313,13 @@ void Engine::Init() {
m_whoosh[x] = nullptr; m_whoosh[x] = nullptr;
} }
char* ch = new char[2];
std::cout << "Jouer en ligne? [o/N] "; std::cout << "Jouer en ligne? [o/N] ";
std::cin >> ch; std::cin.getline(ch, 2);
std::cout << std::endl; std::cout << std::endl;
if (ch == 'o' || ch == 'O') { if (*ch == 'o' || *ch == 'O') {
char* input = new char[32]; char* input = new char[32];
std::string playname, srvname; std::string playname, srvname;
@ -358,6 +359,7 @@ void Engine::Init() {
} }
else std::cout << "Erreur de creation de socket." << std::endl; else std::cout << "Erreur de creation de socket." << std::endl;
} }
delete[] ch;
m_world.SetSeed(seed); m_world.SetSeed(seed);

3
SQCSim2021/remoteplayer.h
View File

@ -8,7 +8,7 @@
class RemotePlayer : public Player { class RemotePlayer : public Player {
public: public:
enum Anim { STILL = 1, RUNNING = 2, JUMPING = 4, SHOOTING = 8, POWERUP = 16, DEAD = 32 }; enum Anim: uint8_t { STILL = 1, RUNNING = 2, JUMPING = 4, SHOOTING = 8, POWERUP = 16, DEAD = 32 };
RemotePlayer(netprot::PlayerInfo pinfo); RemotePlayer(netprot::PlayerInfo pinfo);
@ -17,6 +17,7 @@ public:
private: private:
netprot::Output current, previous; netprot::Output current, previous;
std::map<uint64_t, netprot::Output> m_outbuf;
netprot::PlayerInfo m_pinfo; netprot::PlayerInfo m_pinfo;
float m_aminacc; float m_aminacc;
Anim m_animstate; Anim m_animstate;