diff --git a/gfx/atlas/atlas.png b/gfx/atlas/atlas.png index 2358f4d..dc3a5ce 100644 Binary files a/gfx/atlas/atlas.png and b/gfx/atlas/atlas.png differ diff --git a/src/game/options.h b/src/game/options.h index 0970986..ce6c573 100644 --- a/src/game/options.h +++ b/src/game/options.h @@ -33,8 +33,6 @@ extern void drawWidgets(void); extern Texture *getTexture(const char *filename); extern Atlas *getImageFromAtlas(char *filename); extern void doWidgets(void); -extern void drawWidgets(void); -extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); extern void saveConfig(void); extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); @@ -44,4 +42,3 @@ extern void playSound(int snd, int ch); extern App app; extern Colors colors; -extern Game game; diff --git a/src/hub/postMission.h b/src/hub/postMission.h index 721fac2..5295dda 100644 --- a/src/hub/postMission.h +++ b/src/hub/postMission.h @@ -31,7 +31,6 @@ extern Texture *getTexture(const char *filename); extern Atlas *getImageFromAtlas(char *filename); extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void drawLine(int x1, int y1, int x2, int y2, int r, int g, int b, int a); extern float limit(float i, float low, float high); extern void playSound(int snd, int ch); extern int isAcceptControl(void); diff --git a/src/system/widgets.h b/src/system/widgets.h index 34a8d1a..23f3672 100644 --- a/src/system/widgets.h +++ b/src/system/widgets.h @@ -34,7 +34,6 @@ extern void clearControl(int type); extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); extern Texture *getTexture(const char *filename); extern Atlas *getImageFromAtlas(char *filename); -extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); extern void textSize(const char *text, int size, int *w, int *h); extern App app; diff --git a/src/test/atlasTest.c b/src/test/atlasTest.c index 57262f4..f914d18 100644 --- a/src/test/atlasTest.c +++ b/src/test/atlasTest.c @@ -34,7 +34,7 @@ void initAtlasTest(void) loadGame(); - test = 1; + test = 3; switch (test) { @@ -50,5 +50,12 @@ void initAtlasTest(void) case 2: initHub(); break; + + case 3: + STRNCPY(game.worldId, "beachFront1", MAX_NAME_LENGTH); + initWorld(); + stopMusic(); + initPostMission(); + break; } } diff --git a/src/test/atlasTest.h b/src/test/atlasTest.h index 63dbe77..a64a774 100644 --- a/src/test/atlasTest.h +++ b/src/test/atlasTest.h @@ -24,8 +24,8 @@ extern void initWorld(void); extern void initHub(void); extern void loadGame(void); extern void initOptions(void); -extern void loadMusic(char *filename); -extern void playMusic(int loop); +extern void initPostMission(void); +extern void stopMusic(void); extern Dev dev; extern Game game;