From 46958f55432bcbb6f4e90f4dd937d8de355e5785 Mon Sep 17 00:00:00 2001
From: oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Sun, 11 May 2008 21:26:26 +0000
Subject: - podpora kompilacie bez zvuku kompilujte ako make clean && make
 nosound

git-svn-id: http://opensvn.csie.org/tuxanci_ng@51 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
---
 src/Makefile             |   4 +-
 src/Makefile-nosound     | 177 +++++++++++++++++++++++++++++++++++++++++++++++
 src/arenaFile.c          |   1 +
 src/client.c             |  18 -----
 src/fake_audio.c         |  89 ++++++++++++++++++++++++
 src/game.c               |   1 +
 src/gun.c                |   1 +
 src/item.c               |   1 +
 src/screen_analyze.c     |   1 +
 src/screen_choiceArena.c |   2 +
 src/screen_credits.c     |   1 +
 src/screen_gameType.c    |   2 +
 src/screen_mainMenu.c    |   2 +
 src/screen_setting.c     |  28 ++++++++
 src/screen_table.c       |   2 +
 src/screen_world.c       |   2 +-
 src/server.c             |   1 -
 src/teleport.c           |   1 +
 src/tux.c                |   1 +
 19 files changed, 313 insertions(+), 22 deletions(-)
 create mode 100755 src/Makefile-nosound
 create mode 100644 src/fake_audio.c

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index df5b2d2..0db4928 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@
 CC = gcc
 
 #CFLAGS = -O2 -DSUPPORT_NET_SDL_UDP  -I../include -Wall `sdl-config --cflags`
-CFLAGS = -g -O0 -I../include -Wall `sdl-config --cflags`
+CFLAGS = -g -O0 -std=c99 -I../include -Wall `sdl-config --cflags`
 #CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall
 
 BUILD_DIR = .
@@ -11,7 +11,7 @@ LIBS = `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_net
 
 FILES = interface.o font.o list.o image.o layer.o director.o configFile.o tux.o main.o \
 	screen.o screen_world.o wall.o shot.o myTimer.o panel.o net_multiplayer.o \
-	buffer.o dynamicInt.o arena.o arenaFile.o textFile.o sound.o audio.o music.o gun.o \
+	buffer.o dynamicInt.o arena.o arenaFile.o textFile.o audio.o sound.o music.o gun.o \
 	item.o widget_label.o screen_mainMenu.o widget_button.o screen_analyze.o widget_textfield.o \
 	widget_check.o widget_image.o screen_setting.o screen_gameType.o screen_choiceArena.o \
 	widget_buttonimage.o screen_credits.o teleport.o pipe.o homeDirector.o screen_table.o \
diff --git a/src/Makefile-nosound b/src/Makefile-nosound
new file mode 100755
index 0000000..dbe518f
--- /dev/null
+++ b/src/Makefile-nosound
@@ -0,0 +1,177 @@
+
+#CC = /usr/local/gcc/bin/gcc
+CC = gcc
+
+#CFLAGS = -O2 -DSUPPORT_NET_SDL_UDP  -I../include -Wall `sdl-config --cflags`
+CFLAGS = -g -O0 -std=c99 -DNO_SOUND -I../include -Wall `sdl-config --cflags`
+#CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall
+
+BUILD_DIR = .
+LIBS = `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_net
+
+FILES = interface.o font.o list.o image.o layer.o director.o configFile.o tux.o main.o \
+	screen.o screen_world.o wall.o shot.o myTimer.o panel.o net_multiplayer.o \
+	buffer.o dynamicInt.o arena.o arenaFile.o textFile.o fake_audio.o gun.o \
+	item.o widget_label.o screen_mainMenu.o widget_button.o screen_analyze.o widget_textfield.o \
+	widget_check.o widget_image.o screen_setting.o screen_gameType.o screen_choiceArena.o \
+	widget_buttonimage.o screen_credits.o teleport.o pipe.o homeDirector.o screen_table.o \
+	sdl_udp.o proto.o server.o client.o term.o keytable.o language.o game.o
+ 
+tuxanci-ng: $(FILES)
+	$(CC) $(CFLAGS) $(LIBS) -o $(BUILD_DIR)/tuxanci-ng $(BUILD_DIR)/*.o
+
+main.o: main.c 
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/main.o -c main.c
+
+interface.o: interface.c ../include/interface.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/interface.o -c interface.c
+
+font.o: font.c ../include/font.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/font.o -c font.c
+
+list.o: list.c ../include/list.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/list.o -c list.c
+
+image.o: image.c ../include/image.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/image.o -c image.c
+
+layer.o: layer.c ../include/layer.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/layer.o -c layer.c
+
+director.o: director.c ../include/director.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/director.o -c director.c
+
+configFile.o: configFile.c ../include/configFile.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/configFile.o -c configFile.c
+
+tux.o: tux.c ../include/tux.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/tux.o -c tux.c
+
+screen.o: screen.c ../include/screen.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen.o -c screen.c
+
+screen_world.o: screen_world.c ../include/screen_world.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_world.o -c screen_world.c
+
+wall.o: wall.c ../include/wall.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/wall.o -c wall.c
+
+shot.o: shot.c ../include/shot.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/shot.o -c shot.c
+
+myTimer.o: myTimer.c ../include/myTimer.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/myTimer.o -c myTimer.c
+
+panel.o: panel.c ../include/panel.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/panel.o -c panel.c
+
+buffer.o: buffer.c ../include/buffer.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/buffer.o -c buffer.c
+
+tcp.o: tcp.c ../include/tcp.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/tcp.o -c tcp.c
+
+udp.o: udp.c ../include/udp.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/udp.o -c udp.c
+
+sdl_udp.o: sdl_udp.c ../include/sdl_udp.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/sdl_udp.o -c sdl_udp.c
+
+proto.o: proto.c ../include/proto.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/proto.o -c proto.c
+
+server.o: server.c ../include/server.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/server.o -c server.c
+
+client.o: client.c ../include/client.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/client.o -c client.c
+
+network.o: network.c ../include/network.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/network.o -c network.c
+
+net_multiplayer.o: net_multiplayer.c ../include/net_multiplayer.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/net_multiplayer.o -c net_multiplayer.c
+
+dynamicInt.o: dynamicInt.c ../include/dynamicInt.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/dynamicInt.o -c dynamicInt.c
+
+arena.o: arena.c ../include/arena.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/arena.o -c arena.c
+
+textFile.o: textFile.c ../include/textFile.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/textFile.o -c textFile.c
+
+arenaFile.o: arenaFile.c ../include/arenaFile.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/arenaFile.o -c arenaFile.c
+
+gun.o: gun.c ../include/gun.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/gun.o -c gun.c
+
+item.o: item.c ../include/item.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/item.o -c item.c
+
+screen_mainMenu.o: screen_mainMenu.c ../include/screen_mainMenu.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_mainMenu.o -c screen_mainMenu.c
+
+screen_analyze.o: screen_analyze.c ../include/screen_analyze.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_analyze.o -c screen_analyze.c
+
+screen_setting.o: screen_setting.c ../include/screen_setting.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_setting.o -c screen_setting.c
+
+screen_gameType.o: screen_gameType.c ../include/screen_gameType.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_gameType.o -c screen_gameType.c
+
+screen_choiceArena.o: screen_choiceArena.c ../include/screen_choiceArena.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_choiceArena.o -c screen_choiceArena.c
+
+screen_credits.o: screen_credits.c ../include/screen_credits.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_credits.o -c screen_credits.c
+
+widget_label.o: widget_label.c ../include/widget_label.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_label.o -c widget_label.c
+
+widget_button.o: widget_button.c ../include/widget_button.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_button.o -c widget_button.c
+
+widget_buttonimage.o: widget_buttonimage.c ../include/widget_buttonimage.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_buttonimage.o -c widget_buttonimage.c
+
+widget_textfield.o: widget_textfield.c ../include/widget_textfield.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_textfield.o -c widget_textfield.c
+
+widget_check.o: widget_check.c ../include/widget_check.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_check.o -c widget_check.c
+
+widget_image.o: widget_image.c ../include/widget_image.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_image.o -c widget_image.c
+
+teleport.o: teleport.c ../include/teleport.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/teleport.o -c teleport.c
+
+pipe.o: pipe.c ../include/pipe.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/pipe.o -c pipe.c
+
+homeDirector.o: homeDirector.c ../include/homeDirector.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/homeDirector.o -c homeDirector.c
+
+screen_table.o: screen_table.c ../include/screen_table.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_table.o -c screen_table.c
+
+term.o: term.c ../include/term.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/term.o -c term.c
+
+keytable.o: keytable.c ../include/keytable.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/keytable.o -c keytable.c
+
+language.o: language.c ../include/language.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/language.o -c language.c
+
+game.o: game.c ../include/game.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/game.o -c game.c
+
+fake_audio.o: fake_audio.c ../include/fake_audio.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/fake_audio.o -c fake_audio.c
+
+clean:
+	rm -rf *.o *.c~ ../include/*.h~ Makefile~
diff --git a/src/arenaFile.c b/src/arenaFile.c
index b829e9e..b30c231 100644
--- a/src/arenaFile.c
+++ b/src/arenaFile.c
@@ -23,6 +23,7 @@
 #ifndef PUBLIC_SERVER
 #include "image.h"
 #include "music.h"
+#include "fake_audio.h"
 #endif
 
 static list_t *listArenaFile;
diff --git a/src/client.c b/src/client.c
index 6953a7b..c770f3c 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -286,20 +285,3 @@ void quitSdlUdpClient()
 }
 
 #endif
-/*
-recv server msg->additem 5 7 303 421 1 0 0
-recv server msg->ping
-recv server msg->shot 3 441 427 -5 0 4 0 0 0
-recv server msg->item -1 5
-recv server msg->delshot 3
-shot is not NULL
-index is 0
-
-recv server msg->additem 2 7 303 223 0 0 0
-recv server msg->additem 3 7 303 283 1 0 0
-recv server msg->additem 4 7 303 337 1 0 0
-recv server msg->ping
-recv server msg->shot 5 144 227 5 0 6 0 1 0
-recv server msg->item -1 2
-recv server msg->delshot 5
-*/
\ No newline at end of file
diff --git a/src/fake_audio.c b/src/fake_audio.c
new file mode 100644
index 0000000..7bccbde
--- /dev/null
+++ b/src/fake_audio.c
@@ -0,0 +1,89 @@
+
+#include "main.h"
+#include "fake_audio.h"
+
+bool_t isAudioInicialized()
+{
+	return TRUE;
+}
+
+void initAudio()
+{
+}
+
+void quitAudio()
+{
+}
+
+bool_t isSoundInicialized()
+{
+	return TRUE;
+}
+
+void initSound()
+{
+}
+
+void addSound(char *file, char *name, int group)
+{
+}
+
+void playSound(char *name, int group)
+{
+}
+
+void setSoundActive(bool_t n)
+{
+}
+
+bool_t isSoundActive()
+{
+	return FALSE;
+}
+
+void quitSound()
+{
+}
+
+bool_t isMusicInicialized()
+{
+	return FALSE;
+}
+
+void initMusic()
+{
+}
+
+void addMusic(char *file, char *name, int group)
+{
+}
+
+void stopMusic()
+{
+}
+
+void playMusic(char *name, int group)
+{
+}
+
+void setMusicActive(bool_t n)
+{
+}
+
+bool_t isMusicActive()
+{
+	return FALSE;
+}
+
+char* getCurrentMusic()
+{
+	return "no_sound";
+}
+
+void delAllMusicInGroup(int group)
+{
+}
+
+void quitMusic()
+{
+}
diff --git a/src/game.c b/src/game.c
index 34334c1..4226c7f 100644
--- a/src/game.c
+++ b/src/game.c
@@ -34,6 +34,7 @@
 #include "audio.h"
 #include "sound.h"
 #include "music.h"
+#include "fake_audio.h"
 
 static void initGame()
 {
diff --git a/src/gun.c b/src/gun.c
index afa6a2f..a1ebdc8 100644
--- a/src/gun.c
+++ b/src/gun.c
@@ -16,6 +16,7 @@
 
 #ifndef PUBLIC_SERVER
 #include "sound.h"
+#include "fake_audio.h"
 #include "screen_world.h"
 #include "interface.h"
 #include "term.h"
diff --git a/src/item.c b/src/item.c
index 44e52ca..6123c55 100644
--- a/src/item.c
+++ b/src/item.c
@@ -14,6 +14,7 @@
 #include "interface.h"
 #include "image.h"
 #include "sound.h"
+#include "fake_audio.h"
 #include "layer.h"
 #include "screen_world.h"
 #include "screen_setting.h"
diff --git a/src/screen_analyze.c b/src/screen_analyze.c
index 474d03c..6cb92a1 100644
--- a/src/screen_analyze.c
+++ b/src/screen_analyze.c
@@ -8,6 +8,7 @@
 #include "screen.h"
 #include "image.h"
 #include "music.h"
+#include "fake_audio.h"
 #include "screen_mainMenu.h"
 #include "list.h"
 #include "screen_analyze.h"
diff --git a/src/screen_choiceArena.c b/src/screen_choiceArena.c
index 5bfaefd..272ae10 100644
--- a/src/screen_choiceArena.c
+++ b/src/screen_choiceArena.c
@@ -9,6 +9,8 @@
 #include "screen.h"
 #include "image.h"
 #include "music.h"
+#include "fake_audio.h"
+
 #include "arenaFile.h"
 #include "screen_mainMenu.h"
 #include "screen_choiceArena.h"
diff --git a/src/screen_credits.c b/src/screen_credits.c
index ce352f9..3416fb5 100644
--- a/src/screen_credits.c
+++ b/src/screen_credits.c
@@ -10,6 +10,7 @@
 #include "screen.h"
 #include "image.h"
 #include "music.h"
+#include "fake_audio.h"
 #include "screen_credits.h"
 
 #include "widget_image.h"
diff --git a/src/screen_gameType.c b/src/screen_gameType.c
index d46924a..def7fc1 100644
--- a/src/screen_gameType.c
+++ b/src/screen_gameType.c
@@ -9,6 +9,8 @@
 #include "screen.h"
 #include "image.h"
 #include "music.h"
+#include "fake_audio.h"
+
 #include "net_multiplayer.h"
 #include "screen_gameType.h"
 #include "list.h"
diff --git a/src/screen_mainMenu.c b/src/screen_mainMenu.c
index 7627dc0..ee295ba 100644
--- a/src/screen_mainMenu.c
+++ b/src/screen_mainMenu.c
@@ -9,6 +9,8 @@
 #include "screen.h"
 #include "image.h"
 #include "music.h"
+#include "fake_audio.h"
+
 #include "screen_mainMenu.h"
 #include "screen_setting.h"
 
diff --git a/src/screen_setting.c b/src/screen_setting.c
index 82bf432..92e88e0 100644
--- a/src/screen_setting.c
+++ b/src/screen_setting.c
@@ -10,6 +10,8 @@
 #include "image.h"
 #include "music.h"
 #include "sound.h"
+#include "fake_audio.h"
+
 #include "screen_mainMenu.h"
 #include "list.h"
 #include "homeDirector.h"
@@ -31,12 +33,17 @@ static widget_button_t *button_back;
 static widget_label_t *label_count_round;
 static widget_label_t *label_name_player1;
 static widget_label_t *label_name_player2;
+
+#ifndef NO_SOUND
 static widget_label_t *label_music;
 static widget_label_t *label_sound;
+#endif
 
 static widget_check_t *check[ITEM_COUNT];
+#ifndef NO_SOUND
 static widget_check_t *check_music;
 static widget_check_t *check_sound;
+#endif
 
 static widget_image_t *image_gun_dual_revolver;
 static widget_image_t *image_gun_scatter;
@@ -72,8 +79,10 @@ void drawScreenSetting()
 	drawWidgetLabel(label_count_round);
 	drawWidgetLabel(label_name_player1);
 	drawWidgetLabel(label_name_player2);
+#ifndef NO_SOUND
 	drawWidgetLabel(label_music);
 	drawWidgetLabel(label_sound);
+#endif
 
 	drawWidgetTextfield(textfield_count_cound);
 	drawWidgetTextfield(textfield_name_player1);
@@ -93,8 +102,10 @@ void drawScreenSetting()
 	drawWidgetImage(image_bonus_4x);
 	drawWidgetImage(image_bonus_hidden);
 
+#ifndef NO_SOUND
 	drawWidgetCheck(check_music);
 	drawWidgetCheck(check_sound);
+#endif
 
 	for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ )
 	{
@@ -117,8 +128,10 @@ void eventScreenSetting()
 	eventWidgetTextfield(textfield_name_player1);
 	eventWidgetTextfield(textfield_name_player2);
 
+#ifndef NO_SOUND
 	eventWidgetCheck(check_music);
 	eventWidgetCheck(check_sound);
+#endif
 
 	for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ )
 	{
@@ -150,6 +163,7 @@ static void eventWidget(void *p)
 		setScreen("mainMenu");
 	}
 
+#ifndef NO_SOUND
 	if( check == check_music )
 	{
 		setMusicActive( check_music->status );
@@ -159,6 +173,7 @@ static void eventWidget(void *p)
 	{
 		setSoundActive( check_sound->status );
 	}
+#endif
 }
 
 static void initSettingFile()
@@ -217,11 +232,13 @@ static void initSettingFile()
 	loadValueFromConfigFile(configFile, "BONUS_HIDDEN", val, STR_SIZE, "YES");
 	check[BONUS_HIDDEN]->status = isYesOrNO(val);
 
+#ifndef NO_SOUND
 	loadValueFromConfigFile(configFile, "MUSIC", val, STR_SIZE, "YES");
 	check_music->status = isYesOrNO(val);
 
 	loadValueFromConfigFile(configFile, "SOUND", val, STR_SIZE, "YES");
 	check_sound->status = isYesOrNO(val);
+#endif
 
 	saveTextFile(configFile);
 }
@@ -253,8 +270,10 @@ static void saveAndDestroyConfigFile()
 	setValueInConfigFile(configFile, "BONUS_4X", getYesOrNo(check[BONUS_4X]->status) );
 	setValueInConfigFile(configFile, "BONUS_HIDDEN", getYesOrNo(check[BONUS_HIDDEN]->status) );
 
+#ifndef NO_SOUND
 	setValueInConfigFile(configFile, "MUSIC", getYesOrNo(check_music->status) );
 	setValueInConfigFile(configFile, "SOUND", getYesOrNo(check_sound->status) );
+#endif
 
 	saveTextFile(configFile);
 	destroyTextFile(configFile);
@@ -279,6 +298,7 @@ void initScreenSetting()
 	textfield_name_player1 = newWidgetTextfield(getParamElse("--name1", "name1"), 110+label_name_player1->w, WINDOW_SIZE_Y-160);
 	textfield_name_player2 = newWidgetTextfield(getParamElse("--name2", "name2"), 110+label_name_player2->w, WINDOW_SIZE_Y-120);
 
+#ifndef NO_SOUND
 	label_music = newWidgetLabel(getMyText("MUSIC"), 100, WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT);
 	check_music = newWidgetCheck(label_music->x + label_music->w  + 10,
 		WINDOW_SIZE_Y-80, isMusicActive() , eventWidget);
@@ -286,6 +306,7 @@ void initScreenSetting()
 		WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT);
 	check_sound = newWidgetCheck(label_sound->x + label_sound->w + 10,
 		WINDOW_SIZE_Y-80, isSoundActive() , eventWidget);
+#endif
 
 	for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ )
 	{
@@ -346,8 +367,10 @@ void initScreenSetting()
 
 	initSettingFile();
 
+#ifndef NO_SOUND
 	eventWidget(check_music);
 	eventWidget(check_sound);
+#endif
 }
 
 void getSettingNameRight(char *s)
@@ -404,8 +427,11 @@ void quitScreenSetting()
 	destroyWidgetLabel(label_count_round);
 	destroyWidgetLabel(label_name_player1);
 	destroyWidgetLabel(label_name_player2);
+
+#ifndef NO_SOUND
 	destroyWidgetLabel(label_music);
 	destroyWidgetLabel(label_sound);
+#endif
 
 	destroyWidgetTextfield(textfield_count_cound);
 	destroyWidgetTextfield(textfield_name_player1);
@@ -425,8 +451,10 @@ void quitScreenSetting()
 	destroyWidgetImage(image_bonus_4x);
 	destroyWidgetImage(image_bonus_hidden);
 
+#ifndef NO_SOUND
 	destroyWidgetCheck(check_music);
 	destroyWidgetCheck(check_sound);
+#endif
 
 	for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ )
 	{
diff --git a/src/screen_table.c b/src/screen_table.c
index 5a02e33..1571489 100644
--- a/src/screen_table.c
+++ b/src/screen_table.c
@@ -12,6 +12,8 @@
 #include "screen.h"
 #include "image.h"
 #include "music.h"
+#include "fake_audio.h"
+
 #include "screen_table.h"
 
 #include "widget_image.h"
diff --git a/src/screen_world.c b/src/screen_world.c
index bd68596..9858a8b 100644
--- a/src/screen_world.c
+++ b/src/screen_world.c
@@ -19,6 +19,7 @@
 #include "image.h"
 #include "music.h"
 #include "sound.h"
+#include "fake_audio.h"
 #include "tux.h"
 #include "wall.h"
 #include "teleport.h"
@@ -69,7 +70,6 @@ void setWorldArena(int id)
 
 void setMaxCountRound(int n)
 {
-	printf("max_count = %d\n", n);
 	max_count = n;
 }
 
diff --git a/src/server.c b/src/server.c
index 9086a73..905ca4b 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1,4 +1,3 @@
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/teleport.c b/src/teleport.c
index e402fcc..d8557e3 100644
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -14,6 +14,7 @@
 #include "layer.h"
 #include "screen_world.h"
 #include "sound.h"
+#include "fake_audio.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/tux.c b/src/tux.c
index c8c2f59..f54fff2 100644
--- a/src/tux.c
+++ b/src/tux.c
@@ -22,6 +22,7 @@
 #ifndef PUBLIC_SERVER
 #include "image.h"
 #include "sound.h"
+#include "fake_audio.h"
 #include "layer.h"
 #include "screen_world.h"
 #include "term.h"
-- 
cgit v1.2.3