From b3c3e0348f19125b5123d6f5c87e2cc91fd0172f Mon Sep 17 00:00:00 2001
From: "chirs241097@gmail.com"
 <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb>
Date: Thu, 6 Mar 2014 02:59:55 +0000
Subject: Make multiplier system function, do some clean-ups.

---
 global.h | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

(limited to 'global.h')

diff --git a/global.h b/global.h
index 9ffa13c..657b546 100644
--- a/global.h
+++ b/global.h
@@ -265,14 +265,13 @@ int frameskips=0,stepskips=0;
 bool IfShowTip=false,FadeTip=false;
 hgeFont *TipFont;
 char lasttip[200];
-int p2t1,p2t2,p2t3,p2t4;
 int whicnt,whrcnt,shots,clrusg;
 bool yelattrib;
 bool Complete=false;
-double linerad=0;
 double bsscale;
 long long score,scminus;
-int mult,multbrk,multbat;
+double mult,lsc;
+int multbrk,multbat;
 int frms;double averfps;
 int plrspd,plrslospd;
 int TenSeconds=10000,TwentySeconds=20000,ThirtySeconds=30000,AMinute=60000;
@@ -407,43 +406,6 @@ void ClearAll(bool cbullet=true)
 		if (cbullet)All2pnt();
 	}
 }
-void SaySomethingAndBye(char *text)
-{
-	ClearAll();
-	DisableAllTower=false;
-	if (IfShowTip)
-	{
-		IfShowTip=false;
-		FadeTip=false;
-		Current_Position=2;
-		ShowTip(text);
-		return;
-	}
-	Current_Position=0;
-	towcnt=bulcnt=0;
-	memset(tower,0,sizeof(tower));
-	memset(bullet,0,sizeof(bullet));
-	gui->Enter();
-}
-DWORD ColTrans(DWORD src,DWORD dsr,DWORD speed)
-{
-	DWORD sr=GETR(src),sg=GETG(src),sb=GETB(src);
-	DWORD dr=GETR(dsr),dg=GETG(dsr),db=GETB(dsr);
-	int times=1;if (LOWFPS)times=17;
-	for (int i=1;i<=times;++i)
-	{
-		if (llabs(sr-dr)<speed)dr=sr;
-		else
-			sr-=(sr-dr)/llabs(sr-dr)*speed;
-		if (llabs(sg-dg)<speed)dg=sg;
-		else
-			sg-=(sg-dg)/llabs(sg-dg)*speed;
-		if (llabs(sb-db)<speed)db=sb;
-		else
-			sb-=(sb-db)/llabs(sb-db)*speed;
-	}
-	return ARGB(0xFF,sr,sg,sb);
-}
 TextureRect GetTextureRect(int type,TColors color)
 {
 	if (type==0)
-- 
cgit v1.2.3