more cleaned-up code

amxmodx/CMisc.cpp

@@ -33,7 +33,7 @@
 // class CPlayer
 // *****************************************************
 
-void CPlayer::Init( edict_t* e , int i )
+void CPlayer::Init(edict_t* e, int i)
 {
 	index = i;
 	pEdict = e;
@@ -55,7 +55,8 @@ void CPlayer::Init( edict_t* e , int i )
 	team.clear();
 }
 
-void CPlayer::Disconnect() {
+void CPlayer::Disconnect()
+{
 	ingame = false;
 	initialized = false;
 	authorized = false;
@@ -64,8 +65,10 @@ void CPlayer::Disconnect() {
 	{
 		ClientCvarQuery_Info *pQuery = cvarQueryQueue.front();
 		unregisterSPForward(pQuery->resultFwd);
+		
 		if (pQuery->params)
 			delete [] pQuery->params;
+		
 		delete pQuery;
 		cvarQueryQueue.pop();
 	}
@@ -73,39 +76,40 @@ void CPlayer::Disconnect() {
 	bot = 0;
 }
 
-void CPlayer::PutInServer() {
+void CPlayer::PutInServer()
+{
 	playtime = gpGlobals->time;
 	ingame = true;
 }
-bool CPlayer::Connect(const char* connectname,const char* ipaddress) {
+
+bool CPlayer::Connect(const char* connectname, const char* ipaddress)
+{
 	name.assign(connectname);
 	ip.assign(ipaddress);
 	time = gpGlobals->time;
 	bot = IsBot();
 	death_killer = 0;
-	memset(flags,0,sizeof(flags));
-	memset(weapons,0,sizeof(weapons));
+	memset(flags, 0, sizeof(flags));
+	memset(weapons, 0, sizeof(weapons));
 	initialized = true;
 	authorized = false;
 
-	const char* authid = GETPLAYERAUTHID( pEdict );
+	const char* authid = GETPLAYERAUTHID(pEdict);
 
-	if ( (authid == 0) || (*authid == 0) 
-		|| (strcmp( authid , "STEAM_ID_PENDING") == 0) )
+	if ((authid == 0) || (*authid == 0) || (strcmp(authid, "STEAM_ID_PENDING") == 0))
 		return true;
 
 	return false;
 }
 
-
-
 // *****************************************************
 // class Grenades
 // *****************************************************
-void Grenades::put( edict_t* grenade, float time, int type, CPlayer* player  )
+
+void Grenades::put(edict_t* grenade, float time, int type, CPlayer* player)
 {
 	Obj* a = new Obj;
-	if ( a == 0 ) return;
+	if (a == 0) return;
 	a->player = player;
 	a->grenade = grenade;
 	a->time = gpGlobals->time + time;
@@ -114,34 +118,37 @@ void Grenades::put( edict_t* grenade, float time, int type, CPlayer* player  )
 	head = a;
 }
 
-bool Grenades::find( edict_t* enemy, CPlayer** p, int& type )
+bool Grenades::find(edict_t* enemy, CPlayer** p, int& type)
 {
 	bool found = false;
 	Obj** a = &head;
-	while ( *a ){
-		if ( (*a)->time > gpGlobals->time ) {
-			if ( (*a)->grenade == enemy ) {
+	
+	while (*a)
+	{
+		if ((*a)->time > gpGlobals->time)
+		{
+			if ((*a)->grenade == enemy)
+			{
 				found = true;
 				(*p) = (*a)->player;
 				type = (*a)->type;
 			}
-		}
-		else {
+		} else {
 			Obj* b = (*a)->next;
 			delete *a;
 			*a = b;
-
 			continue;
-
 		}
 		a = &(*a)->next;
 	}
+	
 	return found;
 }
 
 void Grenades::clear()
 {
-	while(head){
+	while (head)
+	{
 		Obj* a = head->next;
 		delete head;
 		head = a;
@@ -151,21 +158,24 @@ void Grenades::clear()
 // *****************************************************
 // class XVars
 // *****************************************************
-void XVars::clear()  {
+
+void XVars::clear()
+{
 	delete[] head;
 	head = 0;
 	num = 0;
 	size = 0;
 }
 
-int XVars::put( AMX* p, cell* v )
+int XVars::put(AMX* p, cell* v)
 {
-	for(int a = 0; a < num; ++a) {
-		if ( (head[a].amx == p) && (head[a].value == v) )
+	for (int a = 0; a < num; ++a)
+	{
+		if ((head[a].amx == p) && (head[a].value == v))
 			return a;
 	}
 
-	if ( (num >= size) && realloc_array( size ? (size * 2) : 8 ) )
+	if ((num >= size) && realloc_array(size ? (size * 2) : 8))
 		return -1;
 
 	head[num].value = v;
@@ -173,71 +183,90 @@ int XVars::put( AMX* p, cell* v )
 	return num++;
 }
 
-int XVars::realloc_array( int nsize )
+int XVars::realloc_array(int nsize)
 {
 	XVarEle* me = new XVarEle[nsize];
-	if ( me ){
-		for(int a = 0 ; a < num; ++a)
+	
+	if (me)
+	{
+		for (int a = 0 ; a < num; ++a)
 			me[a] = head[a];
+		
 		delete[] head;
 		head = me;
 		size = nsize;
 		return 0;
 	}
+	
 	return 1;
 }
 
 // *****************************************************
 // class TeamIds
 // *****************************************************
+
 TeamIds::TeamIds() { head = 0; newTeam = 0; }
-TeamIds::~TeamIds() {
-	while( head ) {
+
+TeamIds::~TeamIds()
+{
+	while (head)
+	{
 		TeamEle* a = head->next;
 		delete head;
 		head = a;
 	}
 }
 
-void TeamIds::registerTeam( const char* n ,int s )
+void TeamIds::registerTeam(const char* n, int s)
 {
 	TeamEle** a = &head;
-	while( *a ){
-		if ( strcmp((*a)->name.c_str(),n) == 0 ){
-			if (s != -1){
+	
+	while (*a)
+	{
+		if (strcmp((*a)->name.c_str(),n) == 0)
+		{
+			if (s != -1)
+			{
 				(*a)->id = s;
 				newTeam &= ~(1<<(*a)->tid);				
 			}
+			
 			return;
 		}
 		a = &(*a)->next;
 	}
-	*a = new TeamEle( n , s );
-	if ( *a == 0 ) return;
+
+	*a = new TeamEle(n, s);
+	if (*a == 0) return;
 	newTeam |= (1<<(*a)->tid);
 }
 
-int TeamIds::findTeamId( const char* n )
+int TeamIds::findTeamId(const char* n)
 {
 	TeamEle* a = head;
-	while( a ){
-		if ( !stricmp(a->name.c_str(),n) )
+	
+	while (a)
+	{
+		if (!stricmp(a->name.c_str(), n))
 			return a->id;
 		a = a->next;
 	}
+	
 	return -1;
 }
 
-int TeamIds::findTeamIdCase( const char* n)
+int TeamIds::findTeamIdCase(const char* n)
 {
 	TeamEle* a = head;
-	while( a ){
-		if ( !strcmp(a->name.c_str(), n) )
+	
+	while (a)
+	{
+		if (!strcmp(a->name.c_str(), n))
 			return a->id;
 		a = a->next;
 	}
+	
 	return -1;
 }
 
 char TeamIds::TeamEle::uid = 0;
-