From 7aa445f6940b0a46eac2a190abe96ad4e86b3ee1 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 30 Apr 2007 15:17:15 +0000
Subject: [PATCH] Fixed a sound bugg and added a new load bar.

---
 src/data/loadbar.png                         | Bin 1547 -> 235 bytes
 src/data/loadbar_back.png                    | Bin 257 -> 0 bytes
 src/data/loadbar_front.png                   | Bin 446 -> 330 bytes
 src/ei/engine/LWJGLGameWindow.java           |   4 ----
 src/ei/engine/effects/BitmapProgressBar.java |   4 ++--
 src/ei/engine/sound/SoundManager.java        |   6 ++++++
 src/ei/game/gamestate/InGameState.java       |   2 ++
 src/ei/game/gamestate/LoadingState.java      |   7 +------
 8 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 src/data/loadbar_back.png

diff --git a/src/data/loadbar.png b/src/data/loadbar.png
index 076f8bbe6efda242719111aca5aa0f03bd024165..e7dbc196e839dd362acb39f67bdcd10f5d812046 100644
GIT binary patch
delta 174
zcmeC?dCh3t8Q|y6%O%Cdz`(%k>ERN@z`!I3Vso$oNpVq|+dzsf$=lt9;Xep2*t>l4
zL`8W{7CAmWGmox~PbPY5r!x3^x;TbZ+<JR$p&)~T0P{hIogyx~6YeJj7;Ju>v{;W3
zXa)mAMbzqKwbQB$2Tp3dy>OS2;f{bHLqi7xg9{6Tf)WFRAVd`d!-sZW%?2jE`FG-;
PfwXzL`njxgN@xNA25&JC

delta 1524
zcmV<Q1q=G?0gDVtiBL{Q4GJ0x0000DNk~Le0003{000062nGNE0F_9_hX4Qo32;bR
za{vGf6951U69E94oEQKA00(qQO+^RS105DH7h(b*Q;}OMe+7X_L_t(|+O?Tmjx09}
zLv>~~Sx<JC)iNJ`k+SO|$V~>AMt4`0E$cy2YX17;Pu0KuTTen&QN{dN+MgL;j2E3-
ztC+X@>sik~3(hv{jjDiY1n1h?bX{M2?tN6k_C~g_*~MIQUY3ZnP*p;E9n3)Od&a|P
z+QhzSYgM!Ve_W#|O%vUpS})|e+3}FsbM{;3CY{}l$+(<F#~wfKC++V~?AzgH463C{
z$<FQZ>T7L#e<~I-e{&YtS+x$Dkv;EJv6Y>-@9()cV<1XD+Ww|;vEh}U`B}rJ?GD-*
zW(qEEdVrL{+Rw62{ER2nat(TcnR8DiMvck+Kzqyzf5YPIw%_H*a!1xb?d*0=`B|#x
zNjq;APD2;-nH^n`AN&%7zW#oG8#p;%B2|^<Wt|%}uWw&tm(&7FY@wBeC=2n^fhuIc
z(!e1cgS?uppb5)XaAgFc8ilmh7HLrufXozKfuTA!jLl*XUSy>znU#1Fk-_rB>D%c%
zzmiP-fAU;g>*2ZYFi$5&JPyYA-(ai<IFqPJM0c}D^U;c4vv#c^mDF=-mF6}(uzuvv
z2Y9Z`MnP%^IhjR|d6^)fD}!bE-oRCtvdH|~ZctvUdG5>!ow$1~SuA^ISazpD4uHm?
zV@u`jmI9u?y(}Z{8h)W3?8hBv=Ww_AL=3Chf15*$QqL1o%d7tqK=&DR=d~N9bfOxY
zUARxwdj?U70BWG22|5Lt6J;OB#Ji(niRaFq?nm8F12CE4(v#JsjssXZ$gS90C<?#A
zK4(#i18%JrXy?k@)#cY^)%KSwSscGO`-qZw6Rk@#+f$VU9DXz!u0}AcG~k7}w6xc?
zf5rAWb%WR{C1G|}r}<-@JZT%56(ItAkG7ln|7=KCcLtan<Rg4D_o1mjZ9v-TNf#}e
z*33Ou>~E&s&#UV03YyMe`Ez_=BFjV+)$*#BuWpfn0t^n}sPz@-R<latJ-CkvaQ<fi
zHJ*O*EO)!Lc~HkuI1xsHdg$V~A+WR)e{m`cv}HaIiKlo`6c(NOx0)e9ZMS83`>y@0
z0`Rh^Wrc>RENwnmRniqvQvND1J<?dFsulg(@w#wuv=M<alFZ<&Yq}806rxBbR3fuh
z>>L23N3zm6)ihlK8z03OZDS)1<^pn+EC*aeiTS-Ypb>ecHon?qJ|T^((@+=Ef2o8B
zDK<fq1RWCt=lxwkYDY<@a?Yxu(olj-kOKrE;o~%~wdFR>`l#Uro=2D-VRj~mC434*
z5F0s2(h(T!nxh^ZoNGlht$*CU|2}}?N#*=fJLsQ}QWqpF1?a7Tbedx7h0KZ`Q_5C9
z!GKw;E*NMXqDgpM>Dk=TKX3d{e^WgQCGJJNpSzT_o=l!?8c&#6#362hO>jDUPn1Qn
z%cI#M%kjOIXmhNOo}b*8O%z5l5UsYi58`87v*!$^_WV1~EV_nb#J2f+DcaCUK3!O2
ziw9kK*KtUaP?Wmnt;>9_kr&Ew7t}TD<3rHAifjRk!YxCV$P}k~3yF^!e{vk;U5#82
zJp}oyAHSw-^w9;IIL<w~8k=DYB|bWjATS+q(#C>OZ2CU|)Z&fwm|M*mh7TOP6$#at
z<KXzsVYV@<tM^Snp{t>K%M)*>$kuoO<Iyh*AiXnR4&SpLzHG_GRduo98J0U!@SX`p
zmMPUt%(o8XYbM_=44;|me;v?ONZ8x}5z0x|u<CqI9|_!()O#c{D-r*Jg1Zfgd?C9X
zse!(paAJiy=HxMF)1&p9!PR?QXZvu?lTmBid5$xUYjSee=XI}&Rs&NWBM_g-)8>k*
z_G2!scB&~*lb1eb+Dh@EgEv7oy`#_ZP9JBFSe<Ty-920i*?yE%B60a4e65R}KY8d^
ae}4m&_BBal#R0$o0000<MNUMnLSTZ5NZP9a

diff --git a/src/data/loadbar_back.png b/src/data/loadbar_back.png
deleted file mode 100644
index 46728103a248b5e631d0f47d99b67120d2db43be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 257
zcmeAS@N?(olHy`uVBq!ia0y~yV9W%vl{nad<lM;`p+JhWz$3Dlfq`2Xgc%uT&5-~K
zvX^-Jy0TwqmKA5?N!Y3T7bqlK;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki5R#Fq;O^-g
z@IFN~52&!*)5S5Q;?~<Mj=T&E97hZe?0<fkO>u3D?KRIJhB+oe3^Pm^)OZsvA<+$<
o%wRr*R^vsY!HR)=LYm}tId`%+JnOYm06Kxe)78&qol`;+0B7Guc>n+a

diff --git a/src/data/loadbar_front.png b/src/data/loadbar_front.png
index 9a3f809e834ef86967dcfffc5be66473208456c1..8379fec0683f682efa45e745c04dd326d5500ea5 100644
GIT binary patch
delta 270
zcmdnTe2U4qGr-TCmrII^fq{Y7)59f*fq~5!#O7cFl5bMxYynbiN#5=*4F5rJ!QSPQ
zCo0NwvdHlnD$VE0W}oP(UC*%2)5S5Q;?~>S8#xac@VEr3R`{QN<~dib^uUY*qVIb@
z+@8E{RTL}3hLyWr85p*mwFHrOg@7gl!O1ojh6A17cYO+CV)(J4rj&_6y(SGJb+Jbh
z%y2MC2DyfTLE!8RMli$07)c4xGzJDNYNUZSsPEdnDoYcj>Ce%0s3C6|OCEAr&O04z
P0@CQ|>gTe~DWM4fwXaH8

literal 446
zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQl{nad<SwDiL?Fdk;1OBOz`!jG!i)^F=12eq
z*-JcqUD>ZQ%Zl?b)xLXC02Gofag8W(&d<$F%`0JWE=o--Nlj5G&n(GM2+2rQaQE~L
zc%P!0$H2g7;_2cTQgQ3;?Sq_$4MbQSHJ51buGy*gbOx8u7K7kJ)*PE_&Kn++V~|PB
z_cuPU^4T0W28#=)S%6kJ%ss#eq@HlffH?E0%DH!&g+ccGX9>m!{_9>FF*$T_^8qbU
z@P7a#89x14#3WF1|N9oE1Nm#VZWCpwiUE0<p^}LmNKQ~E#K{+C_yX3)@ZdBnvX<hW
vhi4=o7*to!V(k0dFz+%41AEayOh48#v~Cuf^jG<-ILKB{S3j3^P6<r_@KAX{

diff --git a/src/ei/engine/LWJGLGameWindow.java b/src/ei/engine/LWJGLGameWindow.java
index 0eccaf9..da9b97a 100644
--- a/src/ei/engine/LWJGLGameWindow.java
+++ b/src/ei/engine/LWJGLGameWindow.java
@@ -22,8 +22,6 @@ public class LWJGLGameWindow {
 	private static Camera cam;
 	// The framerate
 	private int fps;
-	// If fullscreen
-	private boolean fullscreen;
 	// The title
 	private String title;
 	// The fps calculator
@@ -64,7 +62,6 @@ public class LWJGLGameWindow {
 		LWJGLGameWindow.width = width;
 		LWJGLGameWindow.height = height;
 		this.fps = fps;
-		this.fullscreen = fullscreen;
 		this.title = title;
 		
 		MultiPrintStream.makeInstance(new MultiPrintStream("log.txt"));
@@ -90,7 +87,6 @@ public class LWJGLGameWindow {
 	public void createWindow(DisplayMode dm, boolean fullscreen){
 		LWJGLGameWindow.width = dm.getWidth();
 		LWJGLGameWindow.height = dm.getHeight();
-		this.fullscreen = fullscreen;
 		MultiPrintStream.makeInstance(new MultiPrintStream("log.txt"));
 		
 	    try {
diff --git a/src/ei/engine/effects/BitmapProgressBar.java b/src/ei/engine/effects/BitmapProgressBar.java
index 8945a60..7d9b2bb 100644
--- a/src/ei/engine/effects/BitmapProgressBar.java
+++ b/src/ei/engine/effects/BitmapProgressBar.java
@@ -97,7 +97,7 @@ public class BitmapProgressBar extends Entity{
 		if(progress != null){
 			progress.setLocation(new Vector3f(
 					(LWJGLGameWindow.getWidth()/2)-progress.getSize().getX(),
-					(LWJGLGameWindow.getHeight()/2)+3,0.0f));
+					(LWJGLGameWindow.getHeight()/2),0.0f));
 		}
 		if(background != null){
 			background.setLocation(getLocation());
@@ -200,7 +200,7 @@ public class BitmapProgressBar extends Entity{
 		if(progress != null){
 			progress.setLocation(new Vector3f(
 					getLocation().getX()-progress.getSize().getX()+(progress.getSize().getX()*procent),
-					getLocation().getY()+6,0.0f));
+					getLocation().getY(),0.0f));
 			progress.render();
 		}
 		if(bar != null)	bar.render();
diff --git a/src/ei/engine/sound/SoundManager.java b/src/ei/engine/sound/SoundManager.java
index 41cc1c2..d0b0185 100644
--- a/src/ei/engine/sound/SoundManager.java
+++ b/src/ei/engine/sound/SoundManager.java
@@ -279,4 +279,10 @@ public class SoundManager {
 		}
 		return instance;
 	}
+	
+	public void clear(){
+		for(int i=0; i<sources.size() ;i++){
+			stopSound(i);
+		}
+	}
 }
diff --git a/src/ei/game/gamestate/InGameState.java b/src/ei/game/gamestate/InGameState.java
index e971d80..9c43bcb 100644
--- a/src/ei/game/gamestate/InGameState.java
+++ b/src/ei/game/gamestate/InGameState.java
@@ -2,6 +2,7 @@ package ei.game.gamestate;
 
 import ei.engine.scene.Node;
 import ei.engine.sound.Sound;
+import ei.engine.sound.SoundManager;
 import ei.engine.state.GameState;
 import ei.game.hud.InGameHud;
 import ei.game.input.InGameKeyboardInput;
@@ -29,6 +30,7 @@ public class InGameState extends GameState{
 	public void init() {
 		PlayerHandler.getInstance().clear();
 		WeaponHandler.getInstance().clear();
+		SoundManager.getInstnace().clear();
 		
 		rootNode = new Node("InGameNode");
 
diff --git a/src/ei/game/gamestate/LoadingState.java b/src/ei/game/gamestate/LoadingState.java
index 4dcb5f6..c6c6b2e 100644
--- a/src/ei/game/gamestate/LoadingState.java
+++ b/src/ei/game/gamestate/LoadingState.java
@@ -20,10 +20,6 @@ public class LoadingState extends GameState{
 	//The files to load
 	private static final String[] TEXTURES = {
 		"data/font.bmp",
-		"data/loadbar_back.png",
-		"data/loadbar_front.png",
-		"data/loadbar.png",
-		"data/logo.png",
 		"data/particle.bmp",
 		"data/splash.png",
 		"data/buildings/cc/cc_building.png",
@@ -104,8 +100,7 @@ public class LoadingState extends GameState{
 		progress.centerToScreen();
 		progress.setBarTexture(new Sprite("ProgressBar","data/loadbar_front.png"));
 		progress.setProgressTexture(new Sprite("Progress","data/loadbar.png"));
-		progress.setBackgroundTexture(new Sprite("progressBackground","data/loadbar_back.png"));
-		
+
 		for(int i=0; i<TEXTURES.length ;i++){
 			addTexture(TEXTURES[i]);
 		}