Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the Arduboy2 library instead of a custom library #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use the Arduboy2 library instead of a custom library #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d525f4e
Use Arduboy2 library instead of custom library
MLXXXp Jul 12, 2016
57e9b60
Add changes made to origial code
MLXXXp Nov 30, 2016
6c0a4c1
Add flashlight and boot logo to startup
MLXXXp Nov 30, 2016
549f954
Fix function DisplayTextOverTime()
MLXXXp Nov 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
752 changes: 0 additions & 752 deletions ArduboyCustom.cpp
View file
Open in desktop

This file was deleted.

217 changes: 0 additions & 217 deletions ArduboyCustom.h
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions GUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
#include "GUI.h"

//int _OverviewXPos = 0;
//int _OverviewYPos = 6;
Vector2d** OverviewLocations;
Vector2d** CombatLocations;

//int _StatusBarIndent = 60;

bool AcceptMenuInput;

SelectionArrow* RepairSelectionArrow;
//SelectionArrow* AuxSelectionArrow;
SelectionArrow* CurrentSelectionArrow;
SelectionArrow* CombatSelectionArrow;
1 change: 0 additions & 1 deletion GUI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extern Vector2d** CombatLocations;
extern int _StatusBarIndent;

extern SelectionArrow* RepairSelectionArrow;
//extern SelectionArrow* AuxSelectionArrow;
extern SelectionArrow* CurrentSelectionArrow;
extern SelectionArrow* CombatSelectionArrow;

Expand Down
7 changes: 2 additions & 5 deletions Globals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#include "Globals.h"

ArduboyCustom arduboy;
Arduboy2Base arduboy;

//int FPS = 60;
float LastUpdateTime = 0;
float MilliPerFrame = 0;
float DeltaTime = 0;
Expand All @@ -11,7 +10,7 @@ int StatusBlinkTime = 60;

State GameState;
State PreviousGameState;
//StatusScreen CurrentStatusScreen;

int MenuWaitTime;
int SequenceStage = 0;
int CurrentSector = 1;
Expand Down Expand Up @@ -44,5 +43,3 @@ float seconds = 60;
int minutes = 9;

float TimeToNextRandomEncounter;

//RandomShipEncounter* ShipEncountered;
17 changes: 2 additions & 15 deletions Globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@

#pragma once

#include "ArduboyCustom.h"
#include <Arduboy2.h>
#include "bitmaps.h"
#include "Vector2d.h"

#define PI 3.14159265

extern ArduboyCustom arduboy;
extern Arduboy2Base arduboy;

//extern int FPS;
extern float LastUpdateTime;
extern float MilliPerFrame;
extern float DeltaTime;
Expand All @@ -32,7 +30,6 @@ extern bool CanHail;
extern bool RunningAway;

typedef enum { Overview, Repair, Auxilary } StatusScreen;
//extern StatusScreen CurrentStatusScreen;

typedef enum { Up, UpRight, Right, DownRight, Down, DownLeft, Left, UpLeft, None } Direction;
extern Direction DPad;
Expand Down Expand Up @@ -67,14 +64,4 @@ extern int BattleRepairsMax;
extern float seconds;
extern int minutes;

//extern float TimeToNextRandomEncounter;
//struct RandomShipEncounter
//{
// int Attack;
// int Defense;
// Loot Prize;
//};
//
//extern RandomShipEncounter* ShipEncountered;

#endif
Loading