diff --git a/src/engine.cpp b/src/engine.cpp index d07534b..a80b9a4 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -254,7 +254,7 @@ void engine_resetLists() { Object *ob, *ob2; Collectable *c1, *c2; - bRect *r1, *r2; + LinkedRect *r1, *r2; ob = engine.bulletHead->next; while(ob != NULL) diff --git a/src/gfx.cpp b/src/gfx.cpp index a246d6a..a376479 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -35,7 +35,7 @@ SDL_Surface *gfx_messageBox; void gfx_init() { - screen_bufferHead = new bRect; + screen_bufferHead = new LinkedRect; screen_bufferHead->next = NULL; screen_bufferTail = screen_bufferHead; diff --git a/src/screen.cpp b/src/screen.cpp index d9316a6..a939ba6 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -28,8 +28,8 @@ along with this program. If not, see . #include "gfx.h" SDL_Surface *screen; -bRect *screen_bufferHead; -bRect *screen_bufferTail; +LinkedRect *screen_bufferHead; +LinkedRect *screen_bufferTail; void screen_blit(SDL_Surface *image, int x, int y) { @@ -56,7 +56,7 @@ void screen_drawBackground() void screen_addBuffer(int x, int y, int w, int h) { - bRect *rect = new bRect; + LinkedRect *rect = new LinkedRect; rect->next = NULL; rect->x = x; @@ -70,8 +70,8 @@ void screen_addBuffer(int x, int y, int w, int h) void screen_flushBuffer() { - bRect *prevRect = screen_bufferHead; - bRect *rect = screen_bufferHead; + LinkedRect *prevRect = screen_bufferHead; + LinkedRect *rect = screen_bufferHead; screen_bufferTail = screen_bufferHead; while (rect->next != NULL) @@ -88,8 +88,8 @@ void screen_flushBuffer() void screen_unBuffer() { - bRect *prevRect = screen_bufferHead; - bRect *rect = screen_bufferHead; + LinkedRect *prevRect = screen_bufferHead; + LinkedRect *rect = screen_bufferHead; screen_bufferTail = screen_bufferHead; while (rect->next != NULL) diff --git a/src/screen.h b/src/screen.h index 7411d2c..47aa7ca 100644 --- a/src/screen.h +++ b/src/screen.h @@ -26,8 +26,8 @@ along with this program. If not, see . #include "structs.h" extern SDL_Surface *screen; -extern bRect *screen_bufferHead; -extern bRect *screen_bufferTail; +extern LinkedRect *screen_bufferHead; +extern LinkedRect *screen_bufferTail; void screen_blit(SDL_Surface *image, int x, int y); void screen_blitText(int i); diff --git a/src/structs.h b/src/structs.h index b70f439..cc5186a 100644 --- a/src/structs.h +++ b/src/structs.h @@ -78,12 +78,12 @@ typedef struct TextObject_ { } TextObject; -typedef struct bRect_ { +typedef struct LinkedRect_ { int x, y, w, h; - struct bRect_ *next; + struct LinkedRect_ *next; -} bRect; +} LinkedRect; typedef struct Planet_ {