- Removed typedef bool from socket.h and included cbasetypes.c instead.

- Cleaned up and corrected the calculation of hit/flee/cri/lucky dodge in status_calc_bl.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6890 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 1 insertions, 29 deletions

diff --git a/src/common/socket.h b/src/common/socket.h
index ba27e34a8..a6a0fb191 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -16,6 +16,7 @@
 #endif

 #include <time.h>

 #include "malloc.h"

+#include "cbasetypes.h"

 

 extern time_t last_tick;

 extern time_t stall_time;

@@ -121,41 +122,12 @@ extern struct socket_data *session[FD_SETSIZE];
 

 extern int fd_max;

 

-

-

-

-

-/////////////////////////////

-// for those still not building c++

-#ifndef __cplusplus

-//////////////////////////////

-

-// boolean types for C

-typedef int bool;

-#define false	(1==0)

-#define true	(1==1)

-

-//////////////////////////////

-#endif // not cplusplus

-//////////////////////////////

-

-

-

 //////////////////////////////////

 // some checking on sockets

 extern bool session_isValid(int fd);

 extern bool session_isActive(int fd);

 //////////////////////////////////

 

-

-

-

-

-

-

-

-

-

 // Function prototype declaration

 

 int make_listen_port(int);