summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-27 03:35:57 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-27 03:35:57 +0000
commit1307b441cd2cdc94bdde1999d48aefb55d91e082 (patch)
tree4674edabfa271c4f0dd2b4f21f783640958e8cac /src/map
parentdfe4ede046db94e2e6e580d2efa13bb9a773ce15 (diff)
downloadhercules-1307b441cd2cdc94bdde1999d48aefb55d91e082.tar.gz
hercules-1307b441cd2cdc94bdde1999d48aefb55d91e082.tar.bz2
hercules-1307b441cd2cdc94bdde1999d48aefb55d91e082.tar.xz
hercules-1307b441cd2cdc94bdde1999d48aefb55d91e082.zip
* Tweeked the declaration and initialization defines for vectors.
* Made do_sockets leave the for loop as soon as the readable number of sockets returned by select is found. * Made all posix compliant systems that support it and FreeBSD >= 5.1 (implements it but doesn't have the posix defines) use the precise and consistent tick() implementation. * Minor tweek to HEAP_SEARCH (same variable can be used in from and to). * Fixed the map server not exiting when make_listen_bind fails and returns -1. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11983 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c3
-rw-r--r--src/map/map.h6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 3ee08824c..d176a9415 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12043,7 +12043,8 @@ int do_init_clif(void)
packetdb_readdb();
set_defaultparse(clif_parse);
- if (!make_listen_bind(bind_ip,map_port)) {
+ if( make_listen_bind(bind_ip,map_port) == -1 )
+ {
ShowFatalError("can't bind game port\n");
exit(EXIT_FAILURE);
}
diff --git a/src/map/map.h b/src/map/map.h
index 3ee4e0c7d..ecdc72c4f 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -374,10 +374,10 @@ struct status_change_entry {
};
struct status_change {
- unsigned int option;// effect state
- unsigned int opt3;// skill state
+ unsigned int option;// effect state (bitfield)
+ unsigned int opt3;// skill state (bitfield)
unsigned short opt1;// body state
- unsigned short opt2;// health state
+ unsigned short opt2;// health state (bitfield)
unsigned char count;
//TODO: See if it is possible to implement the following SC's without requiring extra parameters while the SC is inactive.
unsigned char jb_flag; //Joint Beat type flag