only one bullet list
This commit is contained in:
parent
49e9add522
commit
57383829de
1 changed files with 10 additions and 14 deletions
24
js/game.js
24
js/game.js
|
@ -17,7 +17,6 @@ let Net = new Network("ws://129.151.227.50:8080?name="+CookiePseudo(), Renderer)
|
||||||
let playerId = null; //id of client player
|
let playerId = null; //id of client player
|
||||||
let players = [];
|
let players = [];
|
||||||
let bullets = [];
|
let bullets = [];
|
||||||
let selfBullets = [];
|
|
||||||
let player = null;
|
let player = null;
|
||||||
|
|
||||||
Inp = new Input("canvas", Net,Renderer);
|
Inp = new Input("canvas", Net,Renderer);
|
||||||
|
@ -28,11 +27,9 @@ players=Net.getPlayersToAdd();
|
||||||
|
|
||||||
let dt = 1;
|
let dt = 1;
|
||||||
|
|
||||||
let playerToUpdate;
|
|
||||||
|
|
||||||
function update()
|
function update()
|
||||||
{
|
{
|
||||||
playerToUpdate = Net.getPlayersToUpdate();
|
let playerToUpdate = Net.getPlayersToUpdate();
|
||||||
for (let i = 0;i<playerToUpdate.length;i++)
|
for (let i = 0;i<playerToUpdate.length;i++)
|
||||||
{
|
{
|
||||||
for (let j = 0;j<players.length;j++)
|
for (let j = 0;j<players.length;j++)
|
||||||
|
@ -94,16 +91,16 @@ function addBullets()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateBullets(list,target,dt)
|
function updateBullets(dt)
|
||||||
{
|
{
|
||||||
for(let i = list.length-1;i>=0;i--)
|
for(let i = bullets.length-1;i>=0;i--)
|
||||||
{
|
{
|
||||||
list[i].update(dt);
|
bullets[i].update(dt);
|
||||||
list[i].checkCollisions(target,squares,circles);
|
bullets[i].checkCollisions(player,squares,circles);
|
||||||
if(list[i].deleted)
|
if(bullets[i].deleted)
|
||||||
{
|
{
|
||||||
Renderer.remBullet(list[i]);
|
Renderer.remBullet(bullets[i]);
|
||||||
list.splice(i,1);
|
bullets.splice(i,1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -120,7 +117,7 @@ function game() {
|
||||||
//Inp.player=player; //pour connecter les input au joueur client
|
//Inp.player=player; //pour connecter les input au joueur client
|
||||||
console.log("Connected as id ",playerId);
|
console.log("Connected as id ",playerId);
|
||||||
Inp.player=player;
|
Inp.player=player;
|
||||||
Inp.bullets=selfBullets;
|
Inp.bullets=bullets;
|
||||||
Renderer.AddPlayer(player)
|
Renderer.AddPlayer(player)
|
||||||
players.forEach((p) => {
|
players.forEach((p) => {
|
||||||
Renderer.AddPlayer(p)
|
Renderer.AddPlayer(p)
|
||||||
|
@ -138,8 +135,7 @@ function game() {
|
||||||
players[i].update(squares, circles, dt);
|
players[i].update(squares, circles, dt);
|
||||||
}
|
}
|
||||||
Renderer.ReloadAff();
|
Renderer.ReloadAff();
|
||||||
updateBullets(selfBullets,null,dt);
|
updateBullets(dt);
|
||||||
updateBullets(bullets,player,dt);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let newTime = new Date();
|
let newTime = new Date();
|
||||||
|
|
Loading…
Reference in a new issue