all

1 files changed, 3 insertions, 13 deletions

diff --git a/src/fpsgame/client.cpp b/src/fpsgame/client.cpp
index bd98625..83aa385 100644
--- a/src/fpsgame/client.cpp
+++ b/src/fpsgame/client.cpp
@@ -562,12 +562,6 @@ namespace game {
 		messages.put(buf, p.length());
 		return true;
 	}
-	void connectattempt(const char *name, const char *password, const ENetAddress &address) {
-		copystring(connectpass, password);
-	}
-	void connectfail() {
-		memset(connectpass, 0, sizeof(connectpass));
-	}
 	void gameconnect(bool _remote) {
 		remote = _remote;
 		if(editmode) toggleedit();
@@ -1149,11 +1143,7 @@ namespace game {
 				if(!entities::ents.inrange(i)) break;
 				entities::setspawn(i, true);
 				ai::itemspawned(i);
-				playsound(S_ITEMSPAWN, &entities::ents[i]->o, NULL, 0, 0, 0, -1, 0, 1500);
-				#if 0
-				const char *name = entities::itemname(i);
-				if(name) particle_text(entities::ents[i]->o, name, PART_TEXT, 2000, 0x32FF64, 4.0f, -8);
-				#endif
+				playsound(S_ITEMSPAWN, &entities::ents[i]->o, NULL, 0, 0, -1, 0, 1500);
 				int icon = entities::itemicon(i);
 				if(icon >= 0) particle_icon(vec(0.0f, 0.0f, 4.0f).add(entities::ents[i]->o), icon%4, icon/4, PART_HUD_ICON, 2000, 0xFFFFFF, 2.0f, -8);
 				break;
@@ -1378,8 +1368,8 @@ namespace game {
 			}
 			case N_ANNOUNCE: {
 				int t = getint(p);
-				if	 (t==I_QUAD) {  playsound(S_V_QUAD10, NULL, NULL, 0, 0, 0, -1, 0, 3000);  conoutf(CON_GAMEINFO, "\f2quad damage will spawn in 10 seconds!"); }
-				else if(t==I_BOOST) { playsound(S_V_BOOST10, NULL, NULL, 0, 0, 0, -1, 0, 3000); conoutf(CON_GAMEINFO, "\f2health boost will spawn in 10 seconds!"); }
+				if	 (t==I_QUAD) {  playsound(S_V_QUAD10, NULL, NULL, 0, 0, -1, 0, 3000);  conoutf(CON_GAMEINFO, "\f2quad damage will spawn in 10 seconds!"); }
+				else if(t==I_BOOST) { playsound(S_V_BOOST10, NULL, NULL, 0, 0, -1, 0, 3000); conoutf(CON_GAMEINFO, "\f2health boost will spawn in 10 seconds!"); }
 				break;
 			}
 			case N_NEWMAP: {