summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authororoborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-06-26 14:02:49 +0000
committeroroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-06-26 14:02:49 +0000
commit3501cd8b1173f6c6d8c84f631734344252ebd31d (patch)
tree5063a6cdeb4da221dfa15617a0a05f41bdd81872 /src
parentaa864b63aba5260b8bd35da61c543e08ae03bd49 (diff)
- oprava chyby pri teleportovani tuxa pomocou bonusu teleport
- zdrojak na niektorych distrach nesiel skopilovat lebo nemal includovane headre na select, a "spoliehal" sa na includovanie pomocou inych headrov ( a nahodov to fungovalo ) - kod pre kompilaciu modulov pre gameserver nepouziva sdl-config :) git-svn-id: http://opensvn.csie.org/tuxanci_ng@73 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src')
-rw-r--r--src/client.c8
-rw-r--r--src/server.c6
-rw-r--r--src/tux.c3
-rw-r--r--src/udp.c3
4 files changed, 17 insertions, 3 deletions
diff --git a/src/client.c b/src/client.c
index 912b1b0..f49fefb 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,7 +1,15 @@
+
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+
#include "main.h"
#include "list.h"
#include "tux.h"
diff --git a/src/server.c b/src/server.c
index 2480f4b..a85e9c3 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1,11 +1,15 @@
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#include <sys/types.h>
#include <sys/time.h>
#include "main.h"
diff --git a/src/tux.c b/src/tux.c
index c9d5ff2..7b41798 100644
--- a/src/tux.c
+++ b/src/tux.c
@@ -382,7 +382,8 @@ void tuxTeleport(tux_t *tux)
if( getNetTypeGame() != NET_GAME_TYPE_CLIENT )
{
findFreeSpace(getCurrentArena(), &x, &y, TUX_WIDTH, TUX_HEIGHT);
- setTuxProportion(tux, x, y);
+ moveObjectInSpace(getCurrentArena()->spaceTux, tux, x, y);
+ //setTuxProportion(tux, x, y);
}
if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
diff --git a/src/udp.c b/src/udp.c
index 135b098..545b639 100644
--- a/src/udp.c
+++ b/src/udp.c
@@ -4,6 +4,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <netdb.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
@@ -11,7 +12,7 @@
#include <netdb.h>
#include <string.h>
#include <assert.h>
-#include <netdb.h>
+
#define BUFSIZE 1000
#include "udp.h"