summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-29 23:18:40 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-29 23:18:40 +0000
commit4b2e025ed2bfd1d23dba095e828da403cf82663f (patch)
tree3857b70a8379055a90909071d3a53076389b2555
parenta75f13f9a36ad91cf2fd07257beccbf5bd189c75 (diff)
downloadhercules-4b2e025ed2bfd1d23dba095e828da403cf82663f.tar.gz
hercules-4b2e025ed2bfd1d23dba095e828da403cf82663f.tar.bz2
hercules-4b2e025ed2bfd1d23dba095e828da403cf82663f.tar.xz
hercules-4b2e025ed2bfd1d23dba095e828da403cf82663f.zip
minor code improvement, moved some "hidden" configs to config/Core.h
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15329 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/clif.c15
-rw-r--r--src/map/config/Core.h18
-rw-r--r--src/map/map.h11
-rw-r--r--src/map/status.h2
4 files changed, 23 insertions, 23 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 73f97cdb0..3e2a20514 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3766,18 +3766,13 @@ static void clif_getareachar_pc(struct map_session_data* sd,struct map_session_d
struct block_list *d_bl;
int i;
- if(dstsd->chatID)
- {
- struct chat_data *cd;
- cd=(struct chat_data*)map_id2bl(dstsd->chatID);
- if(cd && cd->usersd[0]==dstsd)
+ if( dstsd->chatID ) {
+ struct chat_data *cd = NULL;
+ if( (cd = (struct chat_data*)map_id2bl(dstsd->chatID)) && cd->usersd[0]==dstsd)
clif_dispchat(cd,sd->fd);
- }
-
- if( dstsd->state.vending )
+ } else if( dstsd->state.vending )
clif_showvendingboard(&dstsd->bl,dstsd->message,sd->fd);
-
- if( dstsd->state.buyingstore )
+ else if( dstsd->state.buyingstore )
clif_buyingstore_entry_single(sd, dstsd);
if(dstsd->spiritball > 0)
diff --git a/src/map/config/Core.h b/src/map/config/Core.h
index 0ccfdbf93..d8d651903 100644
--- a/src/map/config/Core.h
+++ b/src/map/config/Core.h
@@ -6,6 +6,24 @@
**/
/**
+ * Max Refine available to your server
+ * Raising this limit requires edits to /db/refine_db.txt
+ **/
+#define MAX_REFINE 20
+
+//Uncomment to enable the Cell Stack Limit mod.
+//It's only config is the battle_config cell_stack_limit.
+//Only chars affected are those defined in BL_CHAR (mobs and players currently)
+//#define CELL_NOSTACK
+
+//Uncomment to enable circular area checks.
+//By default, all range checks in Aegis are of Square shapes, so a weapon range
+// of 10 allows you to attack from anywhere within a 21x21 area.
+//Enabling this changes such checks to circular checks, which is more realistic,
+// but is not the official behaviour.
+//#define CIRCULAR_AREA
+
+/**
* No settings past this point
**/
#include "./Renewal.h"
diff --git a/src/map/map.h b/src/map/map.h
index 09b47baf1..bb75d57bb 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -27,17 +27,6 @@ enum E_MAPSERVER_ST
MAPSERVER_ST_LAST
};
-//Uncomment to enable the Cell Stack Limit mod.
-//It's only config is the battle_config cell_stack_limit.
-//Only chars affected are those defined in BL_CHAR (mobs and players currently)
-//#define CELL_NOSTACK
-
-//Uncomment to enable circular area checks.
-//By default, all range checks in Aegis are of Square shapes, so a weapon range
-// of 10 allows you to attack from anywhere within a 21x21 area.
-//Enabling this changes such checks to circular checks, which is more realistic,
-// but is not the official behaviour.
-//#define CIRCULAR_AREA
#define MAX_NPC_PER_MAP 512
#define BLOCK_SIZE 8
diff --git a/src/map/status.h b/src/map/status.h
index 9d68d5518..e11252f1d 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -11,8 +11,6 @@ struct homun_data;
struct mercenary_data;
struct status_change;
-//Use this to refer the max refinery level [Skotlex]
-#define MAX_REFINE 20
#define MAX_REFINE_BONUS 5
extern unsigned long StatusChangeFlagTable[];