avoid resetting weaponset data
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2153 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
@@ -168,8 +168,8 @@ playerent *newplayerent() // create a new blank player
|
||||
playerent *d = new playerent;
|
||||
d->lastupdate = lastmillis;
|
||||
setskin(d, rnd(6));
|
||||
weapon::equipplayer(d); // flowtron : avoid overwriting d->spawnstate(gamemode) stuff from the following line (this used to be called afterwards)
|
||||
spawnstate(d);
|
||||
weapon::equipplayer(d);
|
||||
return d;
|
||||
}
|
||||
|
||||
@@ -753,6 +753,7 @@ void vote(int v)
|
||||
putint(p, v);
|
||||
enet_packet_resize(packet, p.length());
|
||||
sendpackettoserv(1, packet);
|
||||
if(!curvote) { /*printf(":: curvote vanished!\n");*/ return; } // flowtron - happens when I call "/stopdemo"! .. seems the map-load happens in-between
|
||||
curvote->stats[v]++;
|
||||
curvote->localplayervoted = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user