From 83105f16239f51f15208b247c731634acf1d8225 Mon Sep 17 00:00:00 2001
From: xHire <xHire@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Sun, 6 Apr 2008 14:15:31 +0000
Subject: - language files have been moved to separate direcotry - fixed
 problem in Makefile when build directory doesn't exist - few cleaning fixes
 in Makefiles

git-svn-id: http://opensvn.csie.org/tuxanci_ng@41 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
---
 data/lang.en              | 30 -----------------------
 data/lang.sk              | 30 -----------------------
 lang/en.lang              |  1 -
 lang/lang.en              | 26 ++++++++++++++++++++
 lang/lang.sk              | 26 ++++++++++++++++++++
 src/Makefile              |  1 +
 src/Makefile-publicServer | 61 +++++++++++++++++++++++++----------------------
 src/publicServer.c        |  2 +-
 8 files changed, 86 insertions(+), 91 deletions(-)
 delete mode 100644 data/lang.en
 delete mode 100644 data/lang.sk
 delete mode 100644 lang/en.lang
 create mode 100644 lang/lang.en
 create mode 100644 lang/lang.sk

diff --git a/data/lang.en b/data/lang.en
deleted file mode 100644
index abb4c8d..0000000
--- a/data/lang.en
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# generally strings
-
-OK Ok
-BACK Back
-NEXT Next
-
-#main menu
-
-PLAY Play
-SETTING Setting
-TABLE Table
-CREDITS Credits
-END End
-
-# setting menu
-
-COUNT_ROUND Count Round
-NAME_PLAYER1 Name Player1 :
-NAME_PLAYER2 Name Player2 :
-MUSIC Music :
-SOUND Sound :
-
-# setting game type
-
-NONE none
-SERVER server
-CLIENT client
-IP_ADDR IP address :
-NET_PORT network port :
diff --git a/data/lang.sk b/data/lang.sk
deleted file mode 100644
index f3bdd84..0000000
--- a/data/lang.sk
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# generally strings
-
-OK Ok
-BACK Späť
-NEXT Ďalej
-
-#main menu
-
-PLAY Hrať
-SETTING Nastavenia
-TABLE Tabuľka
-CREDITS Autori
-END Koniec
-
-# setting menu
-
-COUNT_ROUND Počet kôl
-NAME_PLAYER1 Meno Hraca1 :
-NAME_PLAYER2 Meno Hraca2 :
-MUSIC Hudba :
-SOUND Zvuk :
-
-# setting game type
-
-NONE žiadne
-SERVER server
-CLIENT client
-IP_ADDR IP adresa :
-NET_PORT sieotvy port :
diff --git a/lang/en.lang b/lang/en.lang
deleted file mode 100644
index 8d1c8b6..0000000
--- a/lang/en.lang
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/lang/lang.en b/lang/lang.en
new file mode 100644
index 0000000..490731d
--- /dev/null
+++ b/lang/lang.en
@@ -0,0 +1,26 @@
+
+# generally strings
+OK Ok
+BACK Back
+NEXT Next
+
+# main menu
+PLAY Play
+SETTING Setting
+TABLE Table
+CREDITS Credits
+END End
+
+# setting menu
+COUNT_ROUND Count Round
+NAME_PLAYER1 Name Player1:
+NAME_PLAYER2 Name Player2:
+MUSIC Music:
+SOUND Sound:
+
+# setting game type
+NONE none
+SERVER server
+CLIENT client
+IP_ADDR IP address:
+NET_PORT network port:
diff --git a/lang/lang.sk b/lang/lang.sk
new file mode 100644
index 0000000..4def325
--- /dev/null
+++ b/lang/lang.sk
@@ -0,0 +1,26 @@
+
+# generally strings
+OK Ok
+BACK Späť
+NEXT Ďalej
+
+# main menu
+PLAY Hrať
+SETTING Nastavenia
+TABLE Tabuľka
+CREDITS Autori
+END Koniec
+
+# setting menu
+COUNT_ROUND Počet kôl
+NAME_PLAYER1 Meno Hraca1:
+NAME_PLAYER2 Meno Hraca2:
+MUSIC Hudba:
+SOUND Zvuk:
+
+# setting game type
+NONE žiadne
+SERVER server
+CLIENT client
+IP_ADDR IP adresa:
+NET_PORT sieotvy port:
diff --git a/src/Makefile b/src/Makefile
index 990b752..861529f 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -174,5 +174,6 @@ keytable.o: keytable.c ../include/keytable.h
 
 language.o: language.c ../include/language.h
 	$(CC) $(CFLAGS) -o language.o -c language.c
+
 clean:
 	rm -rf *.o *.c~ ../include/*.h~ Makefile~ tuxanci-ng
diff --git a/src/Makefile-publicServer b/src/Makefile-publicServer
index 0d589e4..498372a 100755
--- a/src/Makefile-publicServer
+++ b/src/Makefile-publicServer
@@ -7,85 +7,88 @@ DESTDIR:=/usr/local
 CFLAGS = -g -O0 -DPUBLIC_SERVER -DSUPPORT_NET_UNIX_UDP -I../include -Wall
 #CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall
 
-BUILD_DIR = ../build-server/
+BUILD_DIR = ../build-server
 LIBS =
 
 FILES = list.o director.o configFile.o tux.o wall.o shot.o myTimer.o  \
-	buffer.o dynamicInt.o arena.o arenaFile.o textFile.o gun.o item.o teleport.o pipe.o\
+	buffer.o dynamicInt.o arena.o arenaFile.o textFile.o gun.o item.o teleport.o pipe.o \
 	udp.o proto.o server.o publicServer.o net_multiplayer.o serverConfigFile.o
 
-$(BUILD_DIR)publicserver: $(FILES)
-	$(CC) $(CFLAGS) $(LIBS) -o $(BUILD_DIR)publicserver $(BUILD_DIR)*.o
+$(BUILD_DIR)/publicserver: mkdir_build $(FILES)
+	$(CC) $(CFLAGS) $(LIBS) -o $(BUILD_DIR)/publicserver $(BUILD_DIR)/*.o
+
+mkdir_build:
+	mkdir -p $(BUILD_DIR)
 
 publicServer.o: publicServer.c 
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)publicServer.o -c publicServer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/publicServer.o -c publicServer.c
 
 list.o: list.c ../include/list.h
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)list.o -c list.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/list.o -c list.c
 
 director.o: director.c ../include/director.h
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)director.o -c director.c
+	$(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
+	$(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
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/tux.o -c tux.c
 
 wall.o: wall.c ../include/wall.h
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)wall.o -c wall.c
+	$(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
+	$(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
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/myTimer.o -c myTimer.c
 
 buffer.o: buffer.c ../include/buffer.h
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)buffer.o -c buffer.c
+	$(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
+	$(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
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/udp.o -c udp.c
 
 proto.o: proto.c ../include/proto.h
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)proto.o -c proto.c
+	$(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
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/server.o -c server.c
 
 net_multiplayer.o: net_multiplayer.c ../include/net_multiplayer.h
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)net_multiplayer.o -c net_multiplayer.c
+	$(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
+	$(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
+	$(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
+	$(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
+	$(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
+	$(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
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/item.o -c item.c
 
 teleport.o: teleport.c ../include/teleport.h
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)teleport.o -c teleport.c
+	$(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
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/pipe.o -c pipe.c
 
 serverConfigFile.o: serverConfigFile.c ../include/serverConfigFile.h
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)serverConfigFile.o -c serverConfigFile.c
-
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/serverConfigFile.o -c serverConfigFile.c
 
 clean:
-	rm -rf $(BUILD_DIR)*.o *.c~ ../include*.h~ Makefile-publicServer~ $(BUILD_DIR)publicserver
+	rm -rf $(BUILD_DIR) ../include*.h~ Makefile-publicServer~
+
diff --git a/src/publicServer.c b/src/publicServer.c
index f1907e9..d6910f7 100644
--- a/src/publicServer.c
+++ b/src/publicServer.c
@@ -60,7 +60,7 @@ int initPublicServer()
 		return -1;
 	}
 
-	setServerMaxClients( atoi( getSetting("MAX_CLIENTS", "--maxclients", "100") ));
+	setServerMaxClients( atoi( getSetting("MAX_CLIENTS", "--maxclients", "32") ));
 
 	return 0;
 }
-- 
cgit v1.2.3