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

SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Conversation 0 Commits 349 Files Changed 181 +12 -7
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0200f77be8 - Show all commits

15
SQCSim2021/engine.cpp
View File

@@ -1324,8 +1324,10 @@ void Engine::Render(float elapsedTime) {
using enum PACKET_TYPE; using enum PACKET_TYPE;
case SYNC: case SYNC:
if (Deserialize(&sync, pck, &bsize)) { if (Deserialize(&sync, pck, &bsize)) {
if (sync.sid != m_conn.getId()) if (sync.sid != m_conn.getId()) {
std::cout << "syncid be no good.";
break; break;
}
if (m_syncs.contains(sync.timestamp)) { if (m_syncs.contains(sync.timestamp)) {
Sync comp = m_syncs[sync.timestamp]; Sync comp = m_syncs[sync.timestamp];
m_player.InflictDamage(sync.hp - comp.hp); m_player.InflictDamage(sync.hp - comp.hp);
@@ -1334,19 +1336,22 @@ void Engine::Render(float elapsedTime) {
if (diff.Length() > .5) if (diff.Length() > .5)
m_player.Move(diff); m_player.Move(diff);
// TODO: m_timer = sync.timer; // TODO: Syncer sync.timer avec le timer
} }
else std::cout << "sync be no good.";
} }
break; break;
case OUTPUT: case OUTPUT:
if (Deserialize(&out, pck, &bsize)) { if (Deserialize(&out, pck, &bsize)) {
RemotePlayer* r = m_players[out.id]; if (!m_players.contains(out.id)) {
if (!r) std::cout << "id be no good. ";
break; break;
r->Feed(out); }
m_players[out.id]->Feed(out);
} }
break; break;
default: default:
std::cout << "packet be no good.";
break; break;
} }
} }

2
SQCSim2021/engine.h
View File

@@ -102,7 +102,7 @@ private:
Bullet* m_bullets[MAX_BULLETS]; Bullet* m_bullets[MAX_BULLETS];
std::unordered_map<uint64_t, Player*> m_players; std::unordered_map<uint64_t, RemotePlayer*> m_players;
netprot::Buffer m_buf, m_bufout; netprot::Buffer m_buf, m_bufout;
std::chrono::high_resolution_clock::time_point m_startTime; std::chrono::high_resolution_clock::time_point m_startTime;