Refactoring & fixed WEAPONSPEC_GUN in content.py

6 files changed, 82 insertions, 82 deletions

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 6b52615e..c0be7bc0 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -771,55 +771,55 @@ int CClient::LoadData()
 
 // ---
 
-void *CClient::SnapGetItem(int SnapId, int Index, CSnapItem *pItem)
+void *CClient::SnapGetItem(int SnapID, int Index, CSnapItem *pItem)
 {
 	CSnapshotItem *i;
-	dbg_assert(SnapId >= 0 && SnapId < NUM_SNAPSHOT_TYPES, "invalid SnapId");
-	i = m_aSnapshots[SnapId]->m_pAltSnap->GetItem(Index);
-	pItem->m_DataSize = m_aSnapshots[SnapId]->m_pAltSnap->GetItemSize(Index);
+	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
+	i = m_aSnapshots[SnapID]->m_pAltSnap->GetItem(Index);
+	pItem->m_DataSize = m_aSnapshots[SnapID]->m_pAltSnap->GetItemSize(Index);
 	pItem->m_Type = i->Type();
-	pItem->m_Id = i->ID();
+	pItem->m_ID = i->ID();
 	return (void *)i->Data();
 }
 
-void CClient::SnapInvalidateItem(int SnapId, int Index)
+void CClient::SnapInvalidateItem(int SnapID, int Index)
 {
 	CSnapshotItem *i;
-	dbg_assert(SnapId >= 0 && SnapId < NUM_SNAPSHOT_TYPES, "invalid SnapId");
-	i = m_aSnapshots[SnapId]->m_pAltSnap->GetItem(Index);
+	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
+	i = m_aSnapshots[SnapID]->m_pAltSnap->GetItem(Index);
 	if(i)
 	{
-		if((char *)i < (char *)m_aSnapshots[SnapId]->m_pAltSnap || (char *)i > (char *)m_aSnapshots[SnapId]->m_pAltSnap + m_aSnapshots[SnapId]->m_SnapSize)
+		if((char *)i < (char *)m_aSnapshots[SnapID]->m_pAltSnap || (char *)i > (char *)m_aSnapshots[SnapID]->m_pAltSnap + m_aSnapshots[SnapID]->m_SnapSize)
 			m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", "snap invalidate problem");
-		if((char *)i >= (char *)m_aSnapshots[SnapId]->m_pSnap && (char *)i < (char *)m_aSnapshots[SnapId]->m_pSnap + m_aSnapshots[SnapId]->m_SnapSize)
+		if((char *)i >= (char *)m_aSnapshots[SnapID]->m_pSnap && (char *)i < (char *)m_aSnapshots[SnapID]->m_pSnap + m_aSnapshots[SnapID]->m_SnapSize)
 			m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", "snap invalidate problem");
 		i->m_TypeAndID = -1;
 	}
 }
 
-void *CClient::SnapFindItem(int SnapId, int Type, int Id)
+void *CClient::SnapFindItem(int SnapID, int Type, int ID)
 {
 	// TODO: linear search. should be fixed.
 	int i;
 
-	if(!m_aSnapshots[SnapId])
+	if(!m_aSnapshots[SnapID])
 		return 0x0;
 
-	for(i = 0; i < m_aSnapshots[SnapId]->m_pSnap->NumItems(); i++)
+	for(i = 0; i < m_aSnapshots[SnapID]->m_pSnap->NumItems(); i++)
 	{
-		CSnapshotItem *pItem = m_aSnapshots[SnapId]->m_pAltSnap->GetItem(i);
-		if(pItem->Type() == Type && pItem->ID() == Id)
+		CSnapshotItem *pItem = m_aSnapshots[SnapID]->m_pAltSnap->GetItem(i);
+		if(pItem->Type() == Type && pItem->ID() == ID)
 			return (void *)pItem->Data();
 	}
 	return 0x0;
 }
 
-int CClient::SnapNumItems(int SnapId)
+int CClient::SnapNumItems(int SnapID)
 {
-	dbg_assert(SnapId >= 0 && SnapId < NUM_SNAPSHOT_TYPES, "invalid SnapId");
-	if(!m_aSnapshots[SnapId])
+	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
+	if(!m_aSnapshots[SnapID])
 		return 0;
-	return m_aSnapshots[SnapId]->m_pSnap->NumItems();
+	return m_aSnapshots[SnapID]->m_pSnap->NumItems();
 }
 
 void CClient::SnapSetStaticsize(int ItemType, int Size)
diff --git a/src/engine/client/client.h b/src/engine/client/client.h
index 8ba70662..35cbad3b 100644
--- a/src/engine/client/client.h
+++ b/src/engine/client/client.h
@@ -266,10 +266,10 @@ public:
 
 	// ---
 
-	void *SnapGetItem(int SnapId, int Index, CSnapItem *pItem);
-	void SnapInvalidateItem(int SnapId, int Index);
-	void *SnapFindItem(int SnapId, int Type, int Id);
-	int SnapNumItems(int SnapId);
+	void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem);
+	void SnapInvalidateItem(int SnapID, int Index);
+	void *SnapFindItem(int SnapID, int Type, int ID);
+	int SnapNumItems(int SnapID);
 	void SnapSetStaticsize(int ItemType, int Size);
 
 	void Render();
diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp
index 045d15d0..f313e6e3 100644
--- a/src/engine/client/graphics.cpp
+++ b/src/engine/client/graphics.cpp
@@ -357,7 +357,7 @@ int CGraphics_OpenGL::LoadTextureRaw(int Width, int Height, int Format, const vo
 int CGraphics_OpenGL::LoadTexture(const char *pFilename, int StorageType, int StoreFormat, int Flags)
 {
 	int l = str_length(pFilename);
-	int Id;
+	int ID;
 	CImageInfo Img;
 	
 	if(l < 3)
@@ -367,9 +367,9 @@ int CGraphics_OpenGL::LoadTexture(const char *pFilename, int StorageType, int St
 		if (StoreFormat == CImageInfo::FORMAT_AUTO)
 			StoreFormat = Img.m_Format;
 
-		Id = LoadTextureRaw(Img.m_Width, Img.m_Height, Img.m_Format, Img.m_pData, StoreFormat, Flags);
+		ID = LoadTextureRaw(Img.m_Width, Img.m_Height, Img.m_Format, Img.m_pData, StoreFormat, Flags);
 		mem_free(Img.m_pData);
-		return Id;
+		return ID;
 	}
 	
 	return m_InvalidTexture;
diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
index 01012a60..fea79285 100644
--- a/src/engine/client/sound.cpp
+++ b/src/engine/client/sound.cpp
@@ -253,21 +253,21 @@ int CSound::Shutdown()
 	return 0;
 }
 
-int CSound::AllocId()
+int CSound::AllocID()
 {
 	// TODO: linear search, get rid of it
-	for(unsigned SampleId = 0; SampleId < NUM_SAMPLES; SampleId++)
+	for(unsigned SampleID = 0; SampleID < NUM_SAMPLES; SampleID++)
 	{
-		if(m_aSamples[SampleId].m_pData == 0x0)
-			return SampleId;
+		if(m_aSamples[SampleID].m_pData == 0x0)
+			return SampleID;
 	}
 
 	return -1;
 }
 
-void CSound::RateConvert(int SampleId)
+void CSound::RateConvert(int SampleID)
 {
-	CSample *pSample = &m_aSamples[SampleId];
+	CSample *pSample = &m_aSamples[SampleID];
 	int NumFrames = 0;
 	short *pNewData = 0;
 	
@@ -311,7 +311,7 @@ int CSound::ReadData(void *pBuffer, int Size)
 int CSound::LoadWV(const char *pFilename)
 {
 	CSample *pSample;
-	int SampleId = -1;
+	int SampleID = -1;
 	char aError[100];
 	WavpackContext *pContext;
 	
@@ -333,10 +333,10 @@ int CSound::LoadWV(const char *pFilename)
 		return -1;
 	}
 
-	SampleId = AllocId();
-	if(SampleId < 0)
+	SampleID = AllocID();
+	if(SampleID < 0)
 		return -1;
-	pSample = &m_aSamples[SampleId];
+	pSample = &m_aSamples[SampleID];
 
 	pContext = WavpackOpenFileInput(ReadData, aError);
 	if (pContext)
@@ -399,8 +399,8 @@ int CSound::LoadWV(const char *pFilename)
 	if(g_Config.m_Debug)
 		dbg_msg("sound/wv", "loaded %s", pFilename);
 
-	RateConvert(SampleId);
-	return SampleId;
+	RateConvert(SampleID);
+	return SampleID;
 }
 
 void CSound::SetListenerPos(float x, float y)
@@ -410,15 +410,15 @@ void CSound::SetListenerPos(float x, float y)
 }
 	
 
-void CSound::SetChannel(int ChannelId, float Vol, float Pan)
+void CSound::SetChannel(int ChannelID, float Vol, float Pan)
 {
-	m_aChannels[ChannelId].m_Vol = (int)(Vol*255.0f);
-	m_aChannels[ChannelId].m_Pan = (int)(Pan*255.0f); // TODO: this is only on and off right now
+	m_aChannels[ChannelID].m_Vol = (int)(Vol*255.0f);
+	m_aChannels[ChannelID].m_Pan = (int)(Pan*255.0f); // TODO: this is only on and off right now
 }
 
-int CSound::Play(int ChannelId, int SampleId, int Flags, float x, float y)
+int CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
 {
-	int VoiceId = -1;
+	int VoiceID = -1;
 	int i;
 	
 	lock_wait(m_SoundLock);
@@ -429,43 +429,43 @@ int CSound::Play(int ChannelId, int SampleId, int Flags, float x, float y)
 		int id = (m_NextVoice + i) % NUM_VOICES;
 		if(!m_aVoices[id].m_pSample)
 		{
-			VoiceId = id;
+			VoiceID = id;
 			m_NextVoice = id+1;
 			break;
 		}
 	}
 	
 	// voice found, use it
-	if(VoiceId != -1)
+	if(VoiceID != -1)
 	{
-		m_aVoices[VoiceId].m_pSample = &m_aSamples[SampleId];
-		m_aVoices[VoiceId].m_pChannel = &m_aChannels[ChannelId];
-		m_aVoices[VoiceId].m_Tick = 0;
-		m_aVoices[VoiceId].m_Vol = 255;
-		m_aVoices[VoiceId].m_Flags = Flags;
-		m_aVoices[VoiceId].m_X = (int)x;
-		m_aVoices[VoiceId].m_Y = (int)y;
+		m_aVoices[VoiceID].m_pSample = &m_aSamples[SampleID];
+		m_aVoices[VoiceID].m_pChannel = &m_aChannels[ChannelID];
+		m_aVoices[VoiceID].m_Tick = 0;
+		m_aVoices[VoiceID].m_Vol = 255;
+		m_aVoices[VoiceID].m_Flags = Flags;
+		m_aVoices[VoiceID].m_X = (int)x;
+		m_aVoices[VoiceID].m_Y = (int)y;
 	}
 	
 	lock_release(m_SoundLock);
-	return VoiceId;
+	return VoiceID;
 }
 
-int CSound::PlayAt(int ChannelId, int SampleId, int Flags, float x, float y)
+int CSound::PlayAt(int ChannelID, int SampleID, int Flags, float x, float y)
 {
-	return Play(ChannelId, SampleId, Flags|ISound::FLAG_POS, x, y);
+	return Play(ChannelID, SampleID, Flags|ISound::FLAG_POS, x, y);
 }
 
-int CSound::Play(int ChannelId, int SampleId, int Flags)
+int CSound::Play(int ChannelID, int SampleID, int Flags)
 {
-	return Play(ChannelId, SampleId, Flags, 0, 0);
+	return Play(ChannelID, SampleID, Flags, 0, 0);
 }
 
-void CSound::Stop(int VoiceId)
+void CSound::Stop(int VoiceID)
 {
 	// TODO: a nice fade out
 	lock_wait(m_SoundLock);
-	m_aVoices[VoiceId].m_pSample = 0;
+	m_aVoices[VoiceID].m_pSample = 0;
 	lock_release(m_SoundLock);
 }
 
diff --git a/src/engine/client/sound.h b/src/engine/client/sound.h
index ac34c2ac..1372b9c4 100644
--- a/src/engine/client/sound.h
+++ b/src/engine/client/sound.h
@@ -18,9 +18,9 @@ public:
 
 	int Update();
 	int Shutdown();
-	int AllocId();
+	int AllocID();
 
-	static void RateConvert(int SampleId);
+	static void RateConvert(int SampleID);
 
 	// TODO: Refactor: clean this mess up
 	static IOHANDLE ms_File;
@@ -29,12 +29,12 @@ public:
 	virtual int LoadWV(const char *pFilename);
 
 	virtual void SetListenerPos(float x, float y);
-	virtual void SetChannel(int ChannelId, float Vol, float Pan);
+	virtual void SetChannel(int ChannelID, float Vol, float Pan);
 
-	int Play(int ChannelId, int SampleId, int Flags, float x, float y);
-	virtual int PlayAt(int ChannelId, int SampleId, int Flags, float x, float y);
-	virtual int Play(int ChannelId, int SampleId, int Flags);
-	virtual void Stop(int VoiceId);
+	int Play(int ChannelID, int SampleID, int Flags, float x, float y);
+	virtual int PlayAt(int ChannelID, int SampleID, int Flags, float x, float y);
+	virtual int Play(int ChannelID, int SampleID, int Flags);
+	virtual void Stop(int VoiceID);
 	virtual void StopAll();
 };
 
diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp
index e3509143..df28283d 100644
--- a/src/engine/client/text.cpp
+++ b/src/engine/client/text.cpp
@@ -35,7 +35,7 @@ static int aFontSizes[] = {8,9,10,11,12,13,14,15,16,17,18,19,20,36,64};
 
 struct CFontChar
 {
-	int m_Id;
+	int m_ID;
 	
 	// these values are scaled to the pFont size
 	// width * font_size == real_size
@@ -244,10 +244,10 @@ class CTextRender : public IEngineTextRender
 	}
 
 
-	void UploadGlyph(CFontSizeData *pSizeData, int Texnum, int SlotId, int Chr, const void *pData)
+	void UploadGlyph(CFontSizeData *pSizeData, int Texnum, int SlotID, int Chr, const void *pData)
 	{
-		int x = (SlotId%pSizeData->m_NumXChars) * (pSizeData->m_TextureWidth/pSizeData->m_NumXChars);
-		int y = (SlotId/pSizeData->m_NumXChars) * (pSizeData->m_TextureHeight/pSizeData->m_NumYChars);
+		int x = (SlotID%pSizeData->m_NumXChars) * (pSizeData->m_TextureWidth/pSizeData->m_NumXChars);
+		int y = (SlotID/pSizeData->m_NumXChars) * (pSizeData->m_TextureHeight/pSizeData->m_NumYChars);
 		
 		glBindTexture(GL_TEXTURE_2D, pSizeData->m_aTextures[Texnum]);
 		glTexSubImage2D(GL_TEXTURE_2D, 0, x, y,
@@ -293,7 +293,7 @@ class CTextRender : public IEngineTextRender
 	int RenderGlyph(CFont *pFont, CFontSizeData *pSizeData, int Chr)
 	{
 		FT_Bitmap *pBitmap;
-		int SlotId = 0;
+		int SlotID = 0;
 		int SlotW = pSizeData->m_TextureWidth / pSizeData->m_NumXChars;
 		int SlotH = pSizeData->m_TextureHeight / pSizeData->m_NumYChars;
 		int SlotSize = SlotW*SlotH;
@@ -312,8 +312,8 @@ class CTextRender : public IEngineTextRender
 		pBitmap = &pFont->m_FtFace->glyph->bitmap; // ignore_convention
 		
 		// fetch slot
-		SlotId = GetSlot(pSizeData);
-		if(SlotId < 0)
+		SlotID = GetSlot(pSizeData);
+		if(SlotID < 0)
 			return -1;
 		
 		// adjust spacing
@@ -345,12 +345,12 @@ class CTextRender : public IEngineTextRender
 				ms_aGlyphData[py*SlotW+px] = 255;
 		
 		// upload the glyph
-		UploadGlyph(pSizeData, 0, SlotId, Chr, ms_aGlyphData);
+		UploadGlyph(pSizeData, 0, SlotID, Chr, ms_aGlyphData);
 		
 		if(OutlineThickness == 1)
 		{
 			Grow(ms_aGlyphData, ms_aGlyphDataOutlined, SlotW, SlotH);
-			UploadGlyph(pSizeData, 1, SlotId, Chr, ms_aGlyphDataOutlined);
+			UploadGlyph(pSizeData, 1, SlotID, Chr, ms_aGlyphDataOutlined);
 		}
 		else
 		{
@@ -359,32 +359,32 @@ class CTextRender : public IEngineTextRender
 				Grow(ms_aGlyphData, ms_aGlyphDataOutlined, SlotW, SlotH);
 				Grow(ms_aGlyphDataOutlined, ms_aGlyphData, SlotW, SlotH);
 			}
-			UploadGlyph(pSizeData, 1, SlotId, Chr, ms_aGlyphData);
+			UploadGlyph(pSizeData, 1, SlotID, Chr, ms_aGlyphData);
 		}
 		
 		// set char info
 		{
-			CFontChar *pFontchr = &pSizeData->m_aCharacters[SlotId];
+			CFontChar *pFontchr = &pSizeData->m_aCharacters[SlotID];
 			float Scale = 1.0f/pSizeData->m_FontSize;
 			float Uscale = 1.0f/pSizeData->m_TextureWidth;
 			float Vscale = 1.0f/pSizeData->m_TextureHeight;
 			int Height = pBitmap->rows + OutlineThickness*2 + 2; // ignore_convention
 			int Width = pBitmap->width + OutlineThickness*2 + 2; // ignore_convention
 			
-			pFontchr->m_Id = Chr;
+			pFontchr->m_ID = Chr;
 			pFontchr->m_Height = Height * Scale;
 			pFontchr->m_Width = Width * Scale;
 			pFontchr->m_OffsetX = (pFont->m_FtFace->glyph->bitmap_left-1) * Scale; // ignore_convention
 			pFontchr->m_OffsetY = (pSizeData->m_FontSize - pFont->m_FtFace->glyph->bitmap_top) * Scale; // ignore_convention
 			pFontchr->m_AdvanceX = (pFont->m_FtFace->glyph->advance.x>>6) * Scale; // ignore_convention
 			
-			pFontchr->m_aUvs[0] = (SlotId%pSizeData->m_NumXChars) / (float)(pSizeData->m_NumXChars);
-			pFontchr->m_aUvs[1] = (SlotId/pSizeData->m_NumXChars) / (float)(pSizeData->m_NumYChars);
+			pFontchr->m_aUvs[0] = (SlotID%pSizeData->m_NumXChars) / (float)(pSizeData->m_NumXChars);
+			pFontchr->m_aUvs[1] = (SlotID/pSizeData->m_NumXChars) / (float)(pSizeData->m_NumYChars);
 			pFontchr->m_aUvs[2] = pFontchr->m_aUvs[0] + Width*Uscale;
 			pFontchr->m_aUvs[3] = pFontchr->m_aUvs[1] + Height*Vscale;
 		}
 		
-		return SlotId;
+		return SlotID;
 	}
 
 	CFontChar *GetChar(CFont *pFont, CFontSizeData *pSizeData, int Chr)
@@ -396,7 +396,7 @@ class CTextRender : public IEngineTextRender
 		int i;
 		for(i = 0; i < pSizeData->m_CurrentCharacter; i++)
 		{
-			if(pSizeData->m_aCharacters[i].m_Id == Chr)
+			if(pSizeData->m_aCharacters[i].m_ID == Chr)
 			{
 				pFontchr = &pSizeData->m_aCharacters[i];
 				break;