diff options
| author | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-18 15:14:03 +0000 |
|---|---|---|
| committer | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-18 15:14:03 +0000 |
| commit | ad4f9593333a732f4220463977d0d435f6bfdb3b (patch) | |
| tree | 186c8f77218d65d3f5a297b698e47e6066ebe6d2 /src | |
| parent | bc81766556fc7d9fa7c07a9291eb968747938711 (diff) | |
- audio sa da vypnut pomocou prametra "--noaudio"
- server vo svojom defualt konfigu podporuje verziu "test"
- oprava chyby, server prestal po case odosileat streli ( suvysi s IDmanagerom )
git-svn-id: http://opensvn.csie.org/tuxanci_ng@219 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio/audio.c | 5 | ||||
| -rw-r--r-- | src/base/idManager.c | 3 | ||||
| -rw-r--r-- | src/base/shot.c | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/audio/audio.c b/src/audio/audio.c index 9436791..cc9d81e 100644 --- a/src/audio/audio.c +++ b/src/audio/audio.c @@ -20,6 +20,11 @@ bool_t isAudioInicialized() */ void initAudio() { + if( isParamFlag("--noaudio") ) + { + return; + } + if (SDL_Init(SDL_INIT_AUDIO) == -1) { fprintf(stderr, _("Unable to initialize audio: %s\n"), SDL_GetError()); return; diff --git a/src/base/idManager.c b/src/base/idManager.c index 63667bf..ee6792c 100644 --- a/src/base/idManager.c +++ b/src/base/idManager.c @@ -74,7 +74,8 @@ static int findNewID() } do{ - ret = ( random() % (listID->count + 8 ) ) + 1; + //ret = ( random() % (listID->count + 8 ) ) + 1; + ret = random() % MAX_ID + 1; }while( isRegisterID(ret) != -1 ); //printf("new ID %d\n", ret); diff --git a/src/base/shot.c b/src/base/shot.c index c5cbc05..244da70 100644 --- a/src/base/shot.c +++ b/src/base/shot.c @@ -313,6 +313,7 @@ static void action_check(space_t *space, shot_t *shot, client_t *client) if( isValueInList(client->listSeesShot, shot->id) == 0 ) { addList(client->listSeesShot, newInt(shot->id) ); + printf("proto_send_shot_server(PROTO_SEND_ONE, client, shot);\n"); proto_send_shot_server(PROTO_SEND_ONE, client, shot); } } @@ -336,6 +337,7 @@ void checkShotIsInTuxScreen(arena_t *arena) { thisClient = (client_t *)listClient->list[i]; thisTux = (tux_t *)thisClient->tux; + int del = 0; if( thisTux == NULL || thisTux->control != TUX_CONTROL_NET ) { @@ -350,7 +352,10 @@ void checkShotIsInTuxScreen(arena_t *arena) while( thisClient->listSeesShot->count > 100 ) { delListItem(thisClient->listSeesShot, 0, free); + del++; } + + //if( del > 0 )printf("del = %d\n", del); } } |