Skip to content

Commit

Permalink
fix Bug - upload map as bmp files - delete png's
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcel Döpel authored and Marcel Döpel committed Oct 2, 2012
1 parent 9fdc010 commit 9ee3a16
Show file tree
Hide file tree
Showing 20 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion WebRPGServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ db.open(function (err, db_p) {
server.listen(80);

//Send files
app.get('/*/*.(js|css|java|png|mp3|swf|wav)', function(req, res){
app.get('/*/*.(js|css|java|png|bmp|mp3|swf|wav)', function(req, res){
res.sendfile("."+req.url);
});

Expand Down
Binary file added maps/-1-1.bmp
Binary file not shown.
Binary file removed maps/-1-1.png
Binary file not shown.
Binary file added maps/-10.bmp
Binary file not shown.
Binary file removed maps/-10.png
Binary file not shown.
Binary file added maps/-11.bmp
Binary file not shown.
Binary file removed maps/-11.png
Binary file not shown.
Binary file added maps/0-1.bmp
Binary file not shown.
Binary file removed maps/0-1.png
Binary file not shown.
Binary file added maps/00.bmp
Binary file not shown.
Binary file removed maps/00.png
Binary file not shown.
Binary file added maps/01.bmp
Binary file not shown.
Binary file removed maps/01.png
Binary file not shown.
Binary file added maps/1-1.bmp
Binary file not shown.
Binary file removed maps/1-1.png
Binary file not shown.
Binary file added maps/10.bmp
Binary file not shown.
Binary file removed maps/10.png
Binary file not shown.
Binary file added maps/11.bmp
Binary file not shown.
Binary file removed maps/11.png
Binary file not shown.
36 changes: 18 additions & 18 deletions src/Main.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*@pjs preload="
./maps/-11.png,
./maps/01.png,
./maps/11.png,
./maps/-10.png,
./maps/00.png,
./maps/10.png,
./maps/-1-1.png,
./maps/0-1.png,
./maps/1-1.png,
./maps/-11.bmp,
./maps/01.bmp,
./maps/11.bmp,
./maps/-10.bmp,
./maps/00.bmp,
./maps/10.bmp,
./maps/-1-1.bmp,
./maps/0-1.bmp,
./maps/1-1.bmp,
./sprites/sprite.png,
./sprites/charSprites.png";*/
final int viewWidth = 1000;
Expand Down Expand Up @@ -42,15 +42,15 @@ void setup(){
void start(String name, float x, float y, int d, String map){
//creating Map list and loading Maps
mapList = new ArrayList();
mapList.add("-11.png");
mapList.add("01.png");
mapList.add("11.png");
mapList.add("-10.png");
mapList.add("00.png");
mapList.add("10.png");
mapList.add("-1-1.png");
mapList.add("0-1.png");
mapList.add("1-1.png");
mapList.add("-11.bmp");
mapList.add("01.bmp");
mapList.add("11.bmp");
mapList.add("-10.bmp");
mapList.add("00.bmp");
mapList.add("10.bmp");
mapList.add("-1-1.bmp");
mapList.add("0-1.bmp");
mapList.add("1-1.bmp");
maps = new Maps(mapList, viewWidth, viewHeight, tileSize, map);

//creating Player
Expand Down

0 comments on commit 9ee3a16

Please sign in to comment.