From 48b711d0e323ffd28745f6024c0d2e210028ef88 Mon Sep 17 00:00:00 2001 From: flowtron Date: Sat, 3 Jul 2010 14:53:54 +0000 Subject: [PATCH] removing remnants of client-side entity-arena workaround git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5274 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 4 ++-- source/src/protos.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index e40acdd2..0c52e2c7 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -285,12 +285,12 @@ void checkitems(playerent *d) } } -void spawnallitems(bool is_arena) // spawns items locally +void spawnallitems() // spawns items locally { loopv(ents) if(ents[i].fitsmode(gamemode) || (multiplayer(false) && gamespeed!=100 && (i=-1))) { ents[i].spawned = true; - if(!is_arena) ents[i].twice = false; + ents[i].twice = false; ents[i].lastmillis = lastmillis; } } diff --git a/source/src/protos.h b/source/src/protos.h index 559b0bed..5d13c747 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -644,7 +644,7 @@ extern void checkakimbo(); extern struct projectile *newprojectile(vec &from, vec &to, float speed, bool local, playerent *owner, int gun, int id = lastmillis); // entities -extern void spawnallitems(bool is_arena = false); +extern void spawnallitems(); extern void pickupeffects(int n, playerent *d); extern void renderentities(); extern void rendermapmodels();