- oprava chyby, pri zmeneni zbrane zo samopala, alebo lassera ( informoval xHire )

- prepis sietoveho protokolu, teraz je bezpecnejsi



git-svn-id: http://opensvn.csie.org/tuxanci_ng@3 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

6 files changed, 28 insertions, 8 deletions

diff --git a/include/layer.h b/include/layer.h
index f2612eb..1aded63 100755
--- a/include/layer.h
+++ b/include/layer.h
@@ -46,7 +46,7 @@ extern void addLayer(SDL_Surface *img,
  * Vykresli zoznam na obrazovku
  */
 extern void drawLayer();
-
+extern void drawLayerCenter(int x, int y);
 extern void quitLayer();
 
 #endif
diff --git a/include/main.h b/include/main.h
index 012d446..7761edd 100644
--- a/include/main.h
+++ b/include/main.h
@@ -7,6 +7,8 @@
 #include "string_length.h"
 
 extern char* getParam(char *s);
+extern char* getParamElse(char *s1, char *s2);
+extern bool_t isParamFlag(char *s);
 extern char *getString(int n);
 extern void quit();
 
diff --git a/include/music.h b/include/music.h
index 88785b1..b505069 100644
--- a/include/music.h
+++ b/include/music.h
@@ -21,6 +21,8 @@ extern void initMusic();
 extern void addMusic(char *file, char *name, int group);
 extern void stopMusic();
 extern void playMusic(char *name, int group);
+extern void setMusicActive(bool_t n);
+extern bool_t isMusicActive();
 extern char* getCurrentMusic();
 extern void delAllMusicInGroup(int group);
 extern void quitMusic();
diff --git a/include/net_multiplayer.h b/include/net_multiplayer.h
index 561a1a3..664623b 100644
--- a/include/net_multiplayer.h
+++ b/include/net_multiplayer.h
@@ -30,10 +30,22 @@ extern int initServer(int port);
 extern int initClient(int port, char *ip);
 extern void netSetArena(arena_t *p);
 extern int getNetTypeGame();
-extern void proto_send_settux(tux_t *p);
-extern void proto_send_shottux(tux_t *p);
-extern void proto_send_switchgun(tux_t *p);
-extern void proto_send_additem(item_t *item);
+
+extern void proto_send_init_server(client_t *client);
+extern void proto_recv_init_client(char *msg);
+extern void proto_send_event_server(tux_t *tux, int action, client_t *client);
+extern void proto_recv_event_client(char *msg);
+extern void proto_send_event_client(int action);
+extern void proto_recv_event_server(client_t *client, char *msg);
+extern void proto_send_newtux_server(client_t *client, tux_t *tux);
+extern void proto_recv_newtux_client(char *msg);
+extern void proto_send_deltux_server(client_t *client);
+extern void proto_recv_deltux_client(char *msg);
+extern void proto_send_additem_server(item_t *p);
+extern void proto_recv_additem_client(char *msg);
+extern void proto_send_context_client(tux_t *tux);
+extern void proto_recv_context_server(client_t *client, char *msg);
+
 extern void eventNetMultiplayer();
 extern void quitNetMultiplayer();
 
diff --git a/include/sound.h b/include/sound.h
index 965c977..c3121a4 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -20,6 +20,8 @@ extern bool_t isSoundInicialized();
 extern void initSound();
 extern void addSound(char *file, char *name, int group);
 extern void playSound(char *name, int group);
+extern void setSoundActive(bool_t n);
+extern bool_t isSoundActive();
 extern void quitSound();
 
 #endif
diff --git a/include/tux.h b/include/tux.h
index 072cbbe..068ed63 100644
--- a/include/tux.h
+++ b/include/tux.h
@@ -36,6 +36,9 @@
 #define TUX_RIGHT	6
 #define TUX_DOWN	2
 
+#define TUX_SHOT	5
+#define TUX_SWITCH_GUN	0
+
 
 #define GUN_NONE	-1
 
@@ -98,16 +101,15 @@ extern bool_t isTuxInicialized();
 extern void initTux();
 extern tux_t* newTux();
 extern bool_t isTuxAnyGun(tux_t *tux);
-extern void switchTuxGun(tux_t *tux);
 extern void getCourse(int n, int *x, int *y);
 extern void drawTux(tux_t *p);
 extern void drawListTux(list_t *listTux);
 extern void eventTuxIsDead(tux_t *tux);
 extern tux_t* isConflictWithListTux(list_t *listTux, int x, int y, int w, int h);
+extern int isConflictTuxWithListTux(tux_t *tux, list_t *listTux);
 extern void eventConflictShotWithTux(list_t *listTux, list_t *listShot);
-extern void moveTux(tux_t *p,int n);
-extern void shotTux(tux_t *p);
 extern void tuxTeleport(tux_t *tux);
+extern void actionTux(tux_t *tux, int action);
 extern void eventListTux(list_t *listTux);
 extern tux_t* getTuxID(list_t *listTux, int id);
 extern void getTuxProportion(tux_t *p, int *x,int *y, int *w, int *h);