From 57519265fff800fee0e72d23e893f1d244d81ece Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Wed, 15 Nov 2006 19:15:47 +0000
Subject: [PATCH] no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@681 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp      | 2 +-
 source/src/protos.h            | 4 ++--
 source/src/renderparticles.cpp | 2 +-
 source/src/world.cpp           | 7 +++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 21f355fe..54d9c5b3 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -343,7 +343,7 @@ int findplayerstart(playerent *d, int index)
             int e = findentity(PLAYERSTART, index, rb_team_int(d->team));
             if(e < 0 || e >= ents.length()) continue;
             float dist = nearestenemy(vec(ents[e].x, ents[e].y, ents[e].z), d->team);
-            if(dist == -1) return e;
+            if(dist == -1 || m_arena) return e;
             else if(dist > bestdist || bestent == -1) { bestent = e; bestdist = dist; }
         };
 
diff --git a/source/src/protos.h b/source/src/protos.h
index ae712bb7..92312d1d 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -96,7 +96,7 @@ extern void updateworld(int curtime, int lastmillis);
 extern void startmap(char *name);
 extern void changemap(char *name);
 extern void initclient();
-extern void spawnplayer(playerent *d, bool secure = false);
+extern void spawnplayer(playerent *d);
 extern void selfdamage(int damage, int actor, playerent *act, bool gib = false, playerent *pl = player1);
 extern playerent *newplayerent();
 extern botent *newbotent();
@@ -127,7 +127,7 @@ extern void remip(block &b, int level = 0);
 extern void remipmore(block &b, int level = 0);
 extern int closestent();
 extern int findentity(int type, int index = 0);
-extern int findplayerstart(int team, int index);
+extern int findentity(int type, int index, uchar attr2);
 extern void trigger(int tag, int type, bool savegame);
 extern void resettagareas();
 extern void settagareas();
diff --git a/source/src/renderparticles.cpp b/source/src/renderparticles.cpp
index 1b125382..4cc72c83 100644
--- a/source/src/renderparticles.cpp
+++ b/source/src/renderparticles.cpp
@@ -151,7 +151,7 @@ void particle_trail(int type, int fade, vec &s, vec &e)
     loopi((int)d*2)
     {
         p.add(v);
-        vec d(float(rnd(11)-5), float(rnd(11)-5), float(rnd(11)-5));
+        vec d((float)(rnd(11)-5), (float)(rnd(11)-5), (float)(rnd(11)-5));
         newparticle(p, d, rnd(fade)+fade, type);
     };
 };
diff --git a/source/src/world.cpp b/source/src/world.cpp
index f744033b..78ea3193 100644
--- a/source/src/world.cpp
+++ b/source/src/world.cpp
@@ -294,11 +294,10 @@ int findentity(int type, int index)
     return -1;
 };
 
-int findplayerstart(int team, int index)
+int findentity(int type, int index, uchar attr2)
 {
-    for(int i = index; i<ents.length(); i++) if(ents[i].type==PLAYERSTART && ents[i].attr2==team) return i;
-    loopj(index) if(ents[j].type==PLAYERSTART && ents[j].attr2==team) return j;
-    for(int i = index; i<ents.length(); i++) if(ents[i].type==PLAYERSTART) return i;
+    for(int i = index; i<ents.length(); i++) if(ents[i].type==type && ents[i].attr2==attr2) return i;
+    loopj(index) if(ents[j].type==type && ents[j].attr2==attr2) return j;
     return -1;
 };