Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git

This commit is contained in:
Aaron 2011-08-20 18:18:56 +02:00
commit 51dd7953fb
4 changed files with 26 additions and 30 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.purebasic.com/namespace" version="1.0" creator="PureBasic 4.51 (Windows - x86)">
<project xmlns="http://www.purebasic.com/namespace" version="1.0" creator="PureBasic 4.51 (MacOS X - x86)">
<section name="config">
<options closefiles="1" openmode="0" name="ESCape"/>
<comment>
@ -8,43 +8,42 @@
</comment>
</section>
<section name="data">
<explorer view="..\..\..\" pattern="0"/>
<explorer view="../../../" pattern="0"/>
<log show="1"/>
<lastopen date="2011-08-20 17:42" user="Aaron" host="BERE-PC"/>
<lastopen date="2011-08-20 18:02" user="rubenmueller" host="localhost"/>
</section>
<section name="files">
<file name="src\Main.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="1"/>
<fingerprint md5="ad2f5bd509147b23b258161ffa14e0eb"/>
<file name="src/Main.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="0"/>
<fingerprint md5="71fe866eb4c44a6e8d63f049fa4721d4"/>
</file>
<file name="src\Draw.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="1"/>
<fingerprint md5="a7844b55258bdd4a58b2d55e9593ebb0"/>
<file name="src/Draw.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="0"/>
<fingerprint md5="a4e930d97a78a4a24633817c8cc48f5c"/>
</file>
<file name="src\Events.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="1"/>
<fingerprint md5="9dd8da8cf277ac254b39db24257c65b5"/>
<file name="src/Events.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="0"/>
<fingerprint md5="e8dfdc327acab4f10066636b6d07de30"/>
</file>
<file name="src\Functions.pbi">
<file name="src/Functions.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="1"/>
<fingerprint md5="6a4e4dc75d9d6ab704b82092ed861d05"/>
<fingerprint md5="94f32d32af86b8dd7fb98693843dd721"/>
</file>
<file name="src\Globals.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="1"/>
<fingerprint md5="b7c0f56d905c931b4cab5569d2864c85"/>
<file name="src/Globals.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="0"/>
<fingerprint md5="a1bb9ca37b7d3948c8a287a640230fad"/>
</file>
<file name="src\Structs.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="1"/>
<fingerprint md5="4cec4e716776207d73222c7134793c75"/>
<file name="src/Structs.pbi">
<config load="0" scan="1" panel="1" warn="1" lastopen="0"/>
<fingerprint md5="3670b8c0a4f06f32611d8ba08fca9d35"/>
</file>
</section>
<section name="targets">
<target name="Default Target" enabled="1" default="1">
<inputfile value="src/Main.pb"/>
<outputfile value="bin/escape.exe"/>
<executable value="bin\escape.exe"/>
<outputfile value="bin/escape.app"/>
<options xpskin="1" debug="1"/>
<buildcount enable="1" value="1"/>
<buildcount enable="1" value="0"/>
</target>
</section>
</project>

View file

@ -31,5 +31,7 @@ EndProcedure
Procedure DrawRunningGame()
Box(0, 0, 200, 200, RGB(0, 255, 0))
;Box(0, 0, 200, 200, RGB(0, 255, 0))
DisplaySprite(#Tile01, 20, 20)
EndProcedure

View file

@ -6,14 +6,9 @@
Procedure InitTileset()
CatchSprite(#Tile01, ?Gfx_Tileset)
;ClipSprite(0, 0, 0, 16, 16)
; test the sprite
;DisplaySprite(0, 20, 20)
;ClipSprite(#Tile01, 0, 0, 16, 16)
EndProcedure
; *****************************************************************************
; *****************************************************************************
; * Menu