diff options
| author | xHire <xHire@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-03-20 09:47:54 +0000 |
|---|---|---|
| committer | xHire <xHire@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-03-20 09:47:54 +0000 |
| commit | 08eafa9f1a152ee1486395beb8fb7efe13b5834a (patch) | |
| tree | ad5b0e60b0d94343aab7984b533a468d9e4e0ae8 /src | |
| parent | 01d613a7ccf695090262c9e22c396251146f00bd (diff) | |
all 'DISTDIR's were replaced with 'DESTDIR's which are more usual
git-svn-id: http://opensvn.csie.org/tuxanci_ng@28 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src')
| -rwxr-xr-x | src/Makefile | 2 | ||||
| -rwxr-xr-x | src/Makefile-publicServer | 4 | ||||
| -rw-r--r-- | src/screen_world.c | 4 | ||||
| -rw-r--r-- | src/widget_button.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index b740d40..7160cb5 100755 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ CC = gcc #CFLAGS = -O2 -DSUPPORT_NET_SDL_UDP -I../include -Wall `sdl-config --cflags` CFLAGS = -O2 -I../include -Wall `sdl-config --cflags` -#CFLAGS = -O2 -DDISTDIR=\"$(DISTDIR)\" `sdl-config --cflags` -I../include -Wall +#CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall LIBS = `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_net diff --git a/src/Makefile-publicServer b/src/Makefile-publicServer index 8c4f90f..e0a2a56 100755 --- a/src/Makefile-publicServer +++ b/src/Makefile-publicServer @@ -2,10 +2,10 @@ #CC = /usr/local/gcc/bin/gcc CC = gcc -DISTDIR:=/usr/ +DESTDIR:=/usr/local/ CFLAGS = -g -O0 -DBUBLIC_SERVER -DSUPPORT_NET_UNIX_UDP -I../include -Wall -#CFLAGS = -O2 -DDISTDIR=\"$(DISTDIR)\" `sdl-config --cflags` -I../include -Wall +#CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall LIBS = diff --git a/src/screen_world.c b/src/screen_world.c index 60260b9..f9ef868 100644 --- a/src/screen_world.c +++ b/src/screen_world.c @@ -282,13 +282,13 @@ static void control_keyboard_right(tux_t *tux) actionTux(tux, TUX_DOWN); } - if( mapa[(SDLKey)SDLK_KP0] == SDL_PRESSED ) + if( mapa[(SDLKey)SDLK_LCTRL] == SDL_PRESSED ) { netAction(tux, TUX_SHOT); actionTux(tux, TUX_SHOT); } - if( mapa[(SDLKey)SDLK_KP1] == SDL_PRESSED ) + if( mapa[(SDLKey)SDLK_LSHIFT] == SDL_PRESSED ) { if( tux->isCanSwitchGun == TRUE ) { diff --git a/src/widget_button.c b/src/widget_button.c index 1024091..9a899b1 100644 --- a/src/widget_button.c +++ b/src/widget_button.c @@ -47,7 +47,7 @@ void drawWidgetButton(widget_button_t *p) drawImage(g_button0, p->x, p->y, 0, 0, g_button0->w, g_button0->h); } - drawFont(p->text, p->x+WIDGET_BUTTON_WIDTH/2-p->w/2, p->y+p->h/2, COLOR_WHITE); + drawFont(p->text, p->x+WIDGET_BUTTON_WIDTH/2-p->w/2, p->y+p->h/2-6, COLOR_WHITE); } void eventWidgetButton(widget_button_t *p) |