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

Code tidy.

This commit is contained in:
Steve 2018-03-15 08:01:04 +00:00
parent fc2efeac31
commit 2dcbeb368d
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/game/ending.h
View File

@ -18,20 +18,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#define NUM_ENDING_LINES 6
#include "../common.h"
#define NUM_ENDING_LINES 6
extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center);
extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
extern void endSectionTransition(void);
extern Atlas *getImageFromAtlas(char *filename);
extern Texture *getTexture(const char *filename);
extern char *readFile(const 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 limitTextWidth(int width);
extern void endSectionTransition(void);
extern void startSectionTransition(void);
extern int getWrappedTextHeight(const char *text, int size);
extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
extern void limitTextWidth(int width);
extern char *readFile(const char *filename);
extern void startSectionTransition(void);
extern App app;
extern Colors colors;

4
src/game/options.c
View File

@ -68,8 +68,8 @@ void initOptions(void (*callback)(void))
showWidgetGroup("options");
app.delegate.logic = logic;
app.delegate.draw = draw;
app.delegate.logic = &logic;
app.delegate.draw = &draw;
endSectionTransition();
}

4
src/hub/hub.c
View File

@ -619,8 +619,8 @@ static void returnFromTrophyStats(void)
static void returnFromOptions(void)
{
app.delegate.logic = logic;
app.delegate.draw = draw;
app.delegate.logic = &logic;
app.delegate.draw = &draw;
returnFromTrophyStats();
}

4
src/hub/postMission.c
View File

@ -53,8 +53,8 @@ void initPostMission(void)
playSound(SND_MISSION_COMPLETE, 0);
app.delegate.logic = logic;
app.delegate.draw = draw;
app.delegate.logic = &logic;
app.delegate.draw = &draw;
saveGame();

4
src/world/radar.c
View File

@ -49,8 +49,8 @@ void initRadar(void)
memset(blips, 0, sizeof(Entity*) * MAX_BLIPS);
memset(marker, 0, sizeof(Marker) * MAX_MARKERS);
app.delegate.logic = logic;
app.delegate.draw = draw;
app.delegate.logic = &logic;
app.delegate.draw = &draw;
viewRect.x = (world.bob->x / MAP_TILE_SIZE) - (VIEW_SIZE_X / 2);
viewRect.y = (world.bob->y / MAP_TILE_SIZE) - (VIEW_SIZE_Y / 2);

12
src/world/world.c
View File

@ -133,8 +133,8 @@ void initWorld(void)
game.stats[STAT_MISSIONS_PLAYED]++;
app.delegate.logic = logic;
app.delegate.draw = draw;
app.delegate.logic = &logic;
app.delegate.draw = &draw;
app.restrictTrophyAlert = 1;
@ -826,8 +826,8 @@ void exitRadar(void)
{
startSectionTransition();
app.delegate.logic = logic;
app.delegate.draw = draw;
app.delegate.logic = &logic;
app.delegate.draw = &draw;
endSectionTransition();
}
@ -900,8 +900,8 @@ void quitMission(void)
static void returnFromOptions(void)
{
app.delegate.logic = logic;
app.delegate.draw = draw;
app.delegate.logic = &logic;
app.delegate.draw = &draw;
returnFromTrophyStats();
}