diff options
| author | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-18 19:19:10 +0000 |
|---|---|---|
| committer | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-18 19:19:10 +0000 |
| commit | 8b93dd8dac51e28bb25ad341f594d21a955c3adb (patch) | |
| tree | e04e9ea1d2d9b57c77617614283fc8756c96d53c /src/base/tux.c | |
| parent | a5a03e684b5ed3e8781ce30e5ffd4f73b59c3e97 (diff) | |
- bezpecnejsie prepiannie screenov ( uz sa to nedeje v event() daneho screenu aj ked to on vyvolal )
- do laveho horneho rohu s nevypisuju blbiny
- moduly pouzivaju funkcie actionSpace a actionSpaceFromLocation
- dane funkcie sa pouzivaju aj pri vykreslovani objektov
- btw. je jedno kolko zeru tuxanci top, na kerneli-2.6.25.* to zralo X a na kerneli 2.6.26 to zere 2*X
git-svn-id: http://opensvn.csie.org/tuxanci_ng@159 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src/base/tux.c')
| -rw-r--r-- | src/base/tux.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/src/base/tux.c b/src/base/tux.c index bbc63e0..6823452 100644 --- a/src/base/tux.c +++ b/src/base/tux.c @@ -21,7 +21,6 @@ #include "font.h" #include "image.h" #include "layer.h" -#include "term.h" #include "radar.h" #ifndef NO_SOUND @@ -309,22 +308,14 @@ static void timer_tuxCanSwitchGun(void *p) void eventTuxIsDead(tux_t *tux) { -#ifndef PUBLIC_SERVER - char msg[STR_SIZE]; -#endif - if( tux->status == TUX_STATUS_DEAD ) { return; } -#ifndef PUBLIC_SERVER - sprintf(msg, "tux with id %d is dead\n", tux->id); #ifndef NO_SOUND playSound("dead", SOUND_GROUP_BASE); #endif - appendTextInTerm(msg); -#endif tux->status = TUX_STATUS_DEAD; memset(tux->shot, 0, sizeof(int) * GUN_COUNT); @@ -376,17 +367,10 @@ static void eventTuxIsDeadWIthShot(tux_t *tux, shot_t *shot) void tuxTeleport(tux_t *tux) { int x, y; -#ifndef PUBLIC_SERVER - char msg[STR_SIZE]; -#endif -#ifndef PUBLIC_SERVER - sprintf(msg, "tux with id %d teleporting\n", tux->id); #ifndef NO_SOUND playSound("teleport", SOUND_GROUP_BASE); #endif - appendTextInTerm(msg); -#endif if( getNetTypeGame() != NET_GAME_TYPE_CLIENT ) { @@ -532,9 +516,6 @@ void moveTux(tux_t *tux, int n) void switchTuxGun(tux_t *tux) { int i; -#ifndef PUBLIC_SERVER - char msg[STR_SIZE]; -#endif if( tux->control != TUX_CONTROL_NET && tux->isCanSwitchGun == FALSE ) @@ -550,13 +531,9 @@ void switchTuxGun(tux_t *tux) tux->isCanSwitchGun = FALSE; addTaskToTimer(getCurrentArena()->listTimer, TIMER_ONE, timer_tuxCanSwitchGun, newInt(tux->id), TUX_TIME_CAN_SWITCH_GUN ); -#ifndef PUBLIC_SERVER #ifndef NO_SOUND playSound("switch_gun", SOUND_GROUP_BASE); #endif - sprintf(msg, "tux with id %d switch gun\n", tux->id); - appendTextInTerm(msg); -#endif return; } } @@ -570,13 +547,9 @@ void switchTuxGun(tux_t *tux) addTaskToTimer(getCurrentArena()->listTimer, TIMER_ONE, timer_tuxCanSwitchGun, newInt(tux->id), TUX_TIME_CAN_SWITCH_GUN ); -#ifndef PUBLIC_SERVER #ifndef NO_SOUND playSound("switch_gun", SOUND_GROUP_BASE); #endif - sprintf(msg, "tux with id %d switch gun\n", tux->id); - appendTextInTerm(msg); -#endif return; } @@ -649,14 +622,9 @@ static void pickUpGun(tux_t *tux) if( tux->pickup_time == TUX_MAX_PICKUP && getNetTypeGame() != NET_GAME_TYPE_CLIENT ) { -#ifndef PUBLIC_SERVER - char msg[STR_SIZE]; #ifndef NO_SOUND playSound("switch_gun", SOUND_GROUP_BASE); #endif - sprintf(msg, "tux with id %d pickup\n", tux->id); - appendTextInTerm(msg); -#endif tux->gun = GUN_SIMPLE; tux->shot[ tux->gun ] = GUN_MAX_SHOT; @@ -681,10 +649,6 @@ static void eventBonus(tux_t *tux) if( tux->bonus_time == 0 && getNetTypeGame() != NET_GAME_TYPE_CLIENT ) { -#ifndef PUBLIC_SERVER - char msg[STR_SIZE]; -#endif - if( tux->bonus == BONUS_GHOST ) { int x, y, w, h; @@ -702,11 +666,6 @@ static void eventBonus(tux_t *tux) tux->bonus = BONUS_NONE; -#ifndef PUBLIC_SERVER - sprintf(msg, "tux with id %d bonus disabled\n", tux->id); - appendTextInTerm(msg); -#endif - if( getNetTypeGame() == NET_GAME_TYPE_SERVER ) { proto_send_newtux_server(PROTO_SEND_ALL, NULL, tux); |