From f2cd452d100ef7458d2d492193c85b57c4d6cc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ruben=20Mu=CC=88ller?= <r.mueller@purzwei.de>
Date: Sat, 20 Aug 2011 18:44:21 +0200
Subject: [PATCH 1/3] try to get the image crash handled

---
 src/Functions.pbi | 2 +-
 src/Main.pb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Functions.pbi b/src/Functions.pbi
index acaf932..3f879de 100644
--- a/src/Functions.pbi
+++ b/src/Functions.pbi
@@ -6,7 +6,7 @@
 UsePNGImageDecoder()
 
 Procedure InitTileset()
-	LoadSprite(#Tile01, DataPath+"gfx/tileset01.png")
+	LoadSprite(#Tile01, DataPath+"gfx/tileset01.bmp")
 	;ClipSprite(#Tile01, 0, 0, 16, 16)
 EndProcedure
 
diff --git a/src/Main.pb b/src/Main.pb
index 8b2a1ca..0d7ad20 100644
--- a/src/Main.pb
+++ b/src/Main.pb
@@ -98,7 +98,7 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
       EndIf
     EndIf
     
-    Debug CurrentState
+    ; Debug CurrentState
     
     ; Handle the events for the current state
     GameStates(CurrentState)\HandleEventFun()

From f6ab4d9452f017485a845ed1e8d6d766c875ce53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ruben=20Mu=CC=88ller?= <r.mueller@purzwei.de>
Date: Sat, 20 Aug 2011 18:45:54 +0200
Subject: [PATCH 2/3] merge2

---
 src/Functions.pbi | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Functions.pbi b/src/Functions.pbi
index ca0a181..bf3409b 100644
--- a/src/Functions.pbi
+++ b/src/Functions.pbi
@@ -6,11 +6,7 @@
 UsePNGImageDecoder()
 
 Procedure InitTileset()
-<<<<<<< HEAD
-	LoadSprite(#Tile01, DataPath+"gfx/tileset01.bmp")
-=======
 	LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
->>>>>>> f089be7018687821daf886b8c0e8a0d907df0e2d
 	;ClipSprite(#Tile01, 0, 0, 16, 16)
 EndProcedure
 

From e07c64c6c7205dd85ece61a5e2a20054c852c9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ruben=20Mu=CC=88ller?= <r.mueller@purzwei.de>
Date: Sat, 20 Aug 2011 19:09:23 +0200
Subject: [PATCH 3/3] fix the image bug

---
 data/gfx/tileset01.bmp | Bin 32824 -> 49180 bytes
 src/Draw.pbi           |   2 +-
 src/Functions.pbi      |   4 +---
 src/Globals.pbi        |   4 ++++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/gfx/tileset01.bmp b/data/gfx/tileset01.bmp
index 99f8196e4fd150e1b682a7b636027ecd3ba26548..9ce510b8ee0a4fa24722cc402ff5b3335785f609 100644
GIT binary patch
literal 49180
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
J1OJ+uzX3akZsPy|

literal 32824
zcmeI0F^<|m7=<0Q1t?9Fj+I<cSjr$#xNsCB(WGRR3xtA#A_W{_rQHL-J+?7NfuneD
zu$kY(C<txd7TYZL#|YbltM~rze>20+Uq2p`=JVZOzxnUu>H8`9;-8YF_n0JKKZkGg
zgTLJOx;<VV)VS}dw=WO8#~<YYd?<J5ANYU|<p6vrcgPR;fDh#Wd?<Iw5BTUhAKgCv
z!++QLN567_{!s3)e}E78P!7O{a)<nY5BN|Hz=v{&{D6=5^1=CEIS60M9r6c0;6ph8
zAIcr_13utGIRGEZ9r6P{;6ph8AIcr_qwA-C`h)&Z4#0<Uhx~*O_)reOhjNGffDiak
z4#0<Uhx~vK_)reK%}3Y&0Z{IdFK_dMf64*;Q|{1T@Btsn0r*hvkRR{?AIbsvQ0|Z)
z@X>WXIR7gG=nv%%`3WEJp&Wn@<qr7)AMl|ZfDh#k`2ipBp&Wn@<qrAL_0vE7L4PO*
z;6u4Xe!>TQC<ov}xkG-y2Ye_8;6u4Xe!vHOC<or=W4O5gW8;7KwX?CCRC#zh&GSLp
zAG*=nJ>BT>(f?tXUg)1LgCFr8^lsdy@gdBr{7?+iyUb=<{nL%A&PT|v%eqJ1@qQ?F
zleMez^ZMJYJ^H81;UbLb>29-y?+6>)$)T{Zo782MZzo2A>7QrqsQ>K+|Cc-%<NLfW
z*UpW`*`cV*=h^eD%H62Sk7Zr9jsMs5Z+-2p|J|rRGzaQ(kj{PgZ+vI8Re#LIka)(v
zJ(>P0f1b^=K^op%zy8?&i&g0Oa9ylI8l3B&XD;1&AL{a0^cw=&TmRSxThF*DHvY$c
zy|)B3{qxLb?bm<wTKB%^O~0)LeqP#oaP(vES-5`w!+vM6dVL=__I0j&{?}f0NCA7Y
z%5R+ga{c<JOG|+BwLd0+-S09tvaG91>wFtl|F|34w5I;C-!Jc`*m?bj!ss{MM#I0|
z@b%aKb^hc2x6wb^PWHavL)DLk-vOQ0!|U(=sPnS_f1l1lrhkyy?l;!lPCwTBmVRx}
kf4=J5b4-HUX8&&*=b344_J3(V9r$6ZzwQ36Uw@MP1<IMdaR2}S

diff --git a/src/Draw.pbi b/src/Draw.pbi
index 7f645be..33ba040 100644
--- a/src/Draw.pbi
+++ b/src/Draw.pbi
@@ -33,5 +33,5 @@ EndProcedure
 Procedure DrawRunningGame()
   ;Box(0, 0, 200, 200, RGB(0, 255, 0))
   
-  DisplaySprite(#Tile01, 20, 20)
+  DrawImage(ImageID(#Tile01), 20, 20)
 EndProcedure
diff --git a/src/Functions.pbi b/src/Functions.pbi
index bf3409b..2f2e9d3 100644
--- a/src/Functions.pbi
+++ b/src/Functions.pbi
@@ -3,10 +3,8 @@
 
 ; *****************************************************************************
 ; * Tileset
-UsePNGImageDecoder()
-
 Procedure InitTileset()
-	LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
+	
 	;ClipSprite(#Tile01, 0, 0, 16, 16)
 EndProcedure
 
diff --git a/src/Globals.pbi b/src/Globals.pbi
index ad40847..44079de 100644
--- a/src/Globals.pbi
+++ b/src/Globals.pbi
@@ -30,3 +30,7 @@ EndEnumeration
 Global Dim Sounds.i(2)
 Sounds(0) = LoadSound(0, #DATA_PATH + "sound/menu_change.wav")
 Sounds(1) = LoadSound(1, #DATA_PATH + "sound/menu_select.wav")
+
+
+UseJPEGImageDecoder()
+Debug LoadImage(#Tile01, #DATA_PATH+"gfx/tileset01.jp")
\ No newline at end of file