
Zeyu Feng 201377605
Dependencies: mbed
On Minerva
Diff: Collision/Collision.cpp
- Revision:
- 22:cded0cd8e1c9
- Parent:
- 20:a36ab1560e73
--- a/Collision/Collision.cpp Fri May 22 04:49:26 2020 +0000 +++ b/Collision/Collision.cpp Fri May 22 16:07:02 2020 +0000 @@ -63,7 +63,8 @@ _check_des_index = 0; if(lcd.getPixel(82,24)||lcd.getPixel(82,25)||lcd.getPixel(82,26)|| lcd.getPixel(82,27)||lcd.getPixel(82,23)||lcd.getPixel(82,22)|| - lcd.getPixel(82,21)||lcd.getPixel(82,20)||lcd.getPixel(82,28)) + lcd.getPixel(82,21)||lcd.getPixel(82,20)||lcd.getPixel(82,28)|| + lcd.getPixel(81,24)||lcd.getPixel(81,25)||lcd.getPixel(81,23)) { _check_des_index = 1; //printf("reach des\n"); @@ -92,7 +93,6 @@ { lcd.clear(); draw_basic(lcd); - lcd.drawRect(10,10,(get_health()+1)*2,3,FILL_BLACK); for(int i =0; i <get_health()+1;i++) lcd.drawSprite(18*i+20,24,7,9,(int*)heart_sprite); lcd.refresh(); @@ -100,7 +100,6 @@ lcd.clear(); draw_basic(lcd); - lcd.drawRect(10,10,get_health()*2,3,FILL_BLACK); for(int i =0; i <get_health();i++) lcd.drawSprite(18*i+20,24,7,9,(int*)heart_sprite); lcd.refresh();