Mercurial > hg > dmlib
changeset 119:a69ed6a504ad
Merged.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 04 Oct 2012 03:43:09 +0300 |
| parents | c36e0316de9f (diff) 4e82d41f0e6f (current diff) |
| children | a4830b62ff5d |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/dmgfx.c Wed Oct 03 14:37:17 2012 +0300 +++ b/dmgfx.c Thu Oct 04 03:43:09 2012 +0300 @@ -11,7 +11,6 @@ SDL_FillRect(screen, &rc, col); } -#define DM_SWAP(T, A, B) { if ((B) < (A)) { T swtmp = (B); B = (A); A = swtmp; } } void dmDrawHLine(SDL_Surface *screen, int x0, int x1, int yc, const Uint32 col) {
--- a/dmlib.h Wed Oct 03 14:37:17 2012 +0300 +++ b/dmlib.h Thu Oct 04 03:43:09 2012 +0300 @@ -164,6 +164,10 @@ typedef float DMFloat; +// Macro for swapping two lvalues of same type +#define DM_SWAP(T, A, B) { if ((B) < (A)) { T swtmp = (B); B = (A); A = swtmp; } } + + /* Drawing modes used by blitting and some other functions. */ enum
--- a/packed.c Wed Oct 03 14:37:17 2012 +0300 +++ b/packed.c Thu Oct 04 03:43:09 2012 +0300 @@ -53,7 +53,7 @@ void argShowHelp() { - dmPrintBanner(stdout, dmProgName, "[options] <packfile> [filename[s]]"); + dmPrintBanner(stdout, dmProgName, "[options] [-p <packfilename>] [filename[s]]"); dmArgsPrintHelp(stdout, optList, optListN); fprintf(stdout, "\n"