Diff: RosenEngine/RosenEngine.h

Revision:

42:ee13e1d103d8

Parent:

41:e1fa36c0492e

--- a/RosenEngine/RosenEngine.h	Wed May 08 09:22:16 2019 +0000
+++ b/RosenEngine/RosenEngine.h	Wed May 08 11:18:40 2019 +0000
@@ -19,44 +19,44 @@
    RosenEngine();
     ~RosenEngine();
     
-    void init(int ship_width,int ship_height,int ship_speed,int ship_xpos,int ship_ypos);
+    void init(int ship_width,int ship_height,int ship_speed,int ship_xpos,int ship_ypos,N5110 *lcd, Gamepad *pad);
     void reset();
-    void read_input(Gamepad &pad);
-    void update(Gamepad &pad);
-    void draw(N5110 &lcd, Gamepad &pad);
+    void read_input();
+    void update();
+    void draw();
     void get_pos();
-    void title(N5110 &lcd);
+    void title();
     int get_ycursor();
     int get_shipno();
-    void ship_select(N5110 &lcd);
+    void ship_select();
     void check_health();
     float timer(int fps);
     bool dead();
-    void intro(N5110 &lcd);
+    void intro();
     Vector2D get_enemynum();
 
     //*** note: add ship width and ship heirgth in place of 6 and 9 to generalize arrays after they are finished
     
 private:
-    void update_shooter_weapon(Gamepad &pad);
-    void draw_ship(N5110 &lcd, Gamepad &pad);
+    void update_shooter_weapon();
+    void draw_ship();
     void set_ship_size();
     void score(int points);
     bool check_collision(int xpos1, int ypos1,int width1,int height1,int xpos2, int ypos2,int width2,int height2);
     bool check_collision1(int xpos1,int width1,int xpos2,int width2);
     void test();
-    void seeker_ship_collision(Gamepad &pad);
-    void shooter_ship_collision(Gamepad &pad);
-    void shooterw_ship_collision(Gamepad &pad);
-    void kestrelw_seeker_collision(Gamepad &pad);
-    void imperionw_seeker_collision(Gamepad &pad);
-    void kestrelw_shooter_collision(Gamepad &pad);
-    void imperionw_shooter_collision(Gamepad &pad);
-    void orionw_collision(Gamepad &pad);
+    void seeker_ship_collision();
+    void shooter_ship_collision();
+    void shooterw_ship_collision();
+    void kestrelw_seeker_collision();
+    void imperionw_seeker_collision();
+    void kestrelw_shooter_collision();
+    void imperionw_shooter_collision();
+    void orionw_collision();
     void scaling(float time_elapsed);
     int rand_no();
-    void game_over(N5110 &lcd);
-    void disp_points(N5110 &lcd);
+    void game_over();
+    void disp_points();
     void check_se_health();
     void check_sh_health();
     int range(int x1, int y1, float x2, float y2);
@@ -90,33 +90,11 @@
     int _no_seekers;
     bool _intro;
     float _wait_time;
+    Gamepad *_pad;
+    N5110 *_lcd;
     
 
 };
-/************STUFF TO FIX******************************
-**** add sound effects for sjield braking
-**** add passive shield regeneration
-**** work on score increase
-**** add title screen with name
-**** make it so back asks you if you are sure and ststes that you will lose all progress
-**** think of level system
-**** orion should send out pulses that stun enemy ships and absorb thier shields(use draw line)
-**** scale shields properly
-**** fix the border issue(i.e the ships clip through healthbar)
-**** make it so enemy ship spawning is random use srand
-**** add in options for lcd brightness and contrast
-**** add in cheats
-**** 
-*/
+
 #endif
-/*
-changes not commited
-*Fix game playing in background
-*Change seeker damage to 175
-*make seeker health 5
-* implement a viewing system for enemy ships
-* enemy comes from below very fast
-* if you hold a button shields come up in front but not sides
-* 
-*
-*/
+