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

Misc fixes and code tidy.

This commit is contained in:
Steve 2018-02-21 08:16:50 +00:00
parent f2c8359e59
commit 84c934a1cb
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gfx/atlas/atlas.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 MiB

After

Width:  |  Height:  |  Size: 4.2 MiB

3
src/game/options.h
View File

@ -33,8 +33,6 @@ extern void drawWidgets(void);
extern Texture *getTexture(const char *filename); extern Texture *getTexture(const char *filename);
extern Atlas *getImageFromAtlas(char *filename); extern Atlas *getImageFromAtlas(char *filename);
extern void doWidgets(void); 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 blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center);
extern void saveConfig(void); extern void saveConfig(void);
extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); 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 App app;
extern Colors colors; extern Colors colors;
extern Game game;

1
src/hub/postMission.h
View File

@ -31,7 +31,6 @@ extern Texture *getTexture(const char *filename);
extern Atlas *getImageFromAtlas(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 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 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 float limit(float i, float low, float high);
extern void playSound(int snd, int ch); extern void playSound(int snd, int ch);
extern int isAcceptControl(void); extern int isAcceptControl(void);

1
src/system/widgets.h
View File

@ -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 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 Texture *getTexture(const char *filename);
extern Atlas *getImageFromAtlas(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 void textSize(const char *text, int size, int *w, int *h);
extern App app; extern App app;

9
src/test/atlasTest.c
View File

@ -34,7 +34,7 @@ void initAtlasTest(void)
loadGame(); loadGame();
test = 1; test = 3;
switch (test) switch (test)
{ {
@ -50,5 +50,12 @@ void initAtlasTest(void)
case 2: case 2:
initHub(); initHub();
break; break;
case 3:
STRNCPY(game.worldId, "beachFront1", MAX_NAME_LENGTH);
initWorld();
stopMusic();
initPostMission();
break;
} }
} }

4
src/test/atlasTest.h
View File

@ -24,8 +24,8 @@ extern void initWorld(void);
extern void initHub(void); extern void initHub(void);
extern void loadGame(void); extern void loadGame(void);
extern void initOptions(void); extern void initOptions(void);
extern void loadMusic(char *filename); extern void initPostMission(void);
extern void playMusic(int loop); extern void stopMusic(void);
extern Dev dev; extern Dev dev;
extern Game game; extern Game game;