walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed struct definitions to use typedef (C style)

This commit is contained in:
onpon4 2016-01-02 17:15:50 -05:00
parent ce94477b70
commit 85de61e2cd
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/structs.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015 onpon4 <onpon4@riseup.net> Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -20,14 +20,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef STRUCTS_H #ifndef STRUCTS_H
#define STRUCTS_H #define STRUCTS_H
struct object { typedef struct object_ {
bool active; bool active;
int classDef; // Used by aliens to determine what they are int classDef; // Used by aliens to determine what they are
int AIType; // Type of articifial intelligence int AIType; // Type of articifial intelligence
int id; // The "job" of the object int id; // The "job" of the object
object *target; // index target in aliens array struct object_ *target; // index target in aliens array
int reload[2]; int reload[2];
@ -42,7 +42,7 @@ struct object {
int face; // Either 0 or 1 int face; // Either 0 or 1
object *owner; // Who owns this object struct object_ *owner; // Who owns this object
int chance[2]; // Chance of using the weapons (out of 1000) int chance[2]; // Chance of using the weapons (out of 1000)
@ -64,11 +64,11 @@ struct object {
float x, y, dx, dy; float x, y, dx, dy;
object *next; struct object_ *next;
}; } object;
struct mission { typedef struct mission_ {
char primaryObjective[3][50]; // Description char primaryObjective[3][50]; // Description
int primaryType[3]; // The type of mission this is int primaryType[3]; // The type of mission this is
@ -88,16 +88,16 @@ struct mission {
int remainingObjectives2; int remainingObjectives2;
int addAliens; // How often to add new enemies int addAliens; // How often to add new enemies
}; } mission;
struct Star { typedef struct Star_ {
float x, y, dx, dy; float x, y, dx, dy;
int speed; // How fast the star moves int speed; // How fast the star moves
}; } Star;
struct collectables { typedef struct collectables_ {
bool active; bool active;
float x, y, dx, dy; float x, y, dx, dy;
@ -106,11 +106,11 @@ struct collectables {
int value; // How much is it worth? int value; // How much is it worth?
int life; // How long it will stay around for int life; // How long it will stay around for
collectables *next; struct collectables_ *next;
}; } collectables;
struct textObject { typedef struct textObject_ {
SDL_Surface *image; SDL_Surface *image;
int life; int life;
@ -118,9 +118,9 @@ struct textObject {
int fontColor; int fontColor;
char text[255]; char text[255];
}; } textObject;
struct Game { typedef struct Game_ {
object thePlayer; object thePlayer;
object playerWeapon; object playerWeapon;
@ -191,25 +191,25 @@ struct Game {
int maxPlasmaAmmoLimit; int maxPlasmaAmmoLimit;
int maxRocketAmmoLimit; int maxRocketAmmoLimit;
}; } Game;
struct ShopItem { typedef struct ShopItem_ {
int x, y; int x, y;
int price; int price;
char name[50]; char name[50];
char description[255]; char description[255];
int image; int image;
}; } ShopItem;
struct bRect { typedef struct bRect_ {
int x, y, w, h; int x, y, w, h;
bRect *next; struct bRect_ *next;
}; } bRect;
struct Planet { typedef struct Planet_ {
int y; int y;
char name[50]; char name[50];
@ -223,7 +223,7 @@ struct Planet {
int faceImage; int faceImage;
char from[50]; char from[50];
char subject[100]; char subject[100];
}; } Planet;
enum keys { enum keys {
KEY_UP, KEY_UP,
@ -240,7 +240,7 @@ enum keys {
KEY_LAST KEY_LAST
}; };
struct Engine { typedef struct Engine_ {
SDL_Event event; SDL_Event event;
int done; int done;
@ -313,22 +313,22 @@ struct Engine {
bool cheatAmmo; bool cheatAmmo;
bool cheatTime; bool cheatTime;
bool cheatCredits; bool cheatCredits;
}; } Engine;
struct event { typedef struct event_ {
int time; int time;
char message[255]; char message[255];
int face; int face;
int entity; int entity;
int flag; int flag;
}; } event;
struct cutMsg { typedef struct cutMsg_ {
int face; int face;
char message[255]; char message[255];
}; } cutMsg;
#endif #endif