diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-10 14:38:12 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-10 14:38:12 +0000 |
| commit | e96f41fafafff988ac27aed09f2459acc4ba78ff (patch) | |
| tree | 0aeed45b3a30ef24b5a71414f85a7d1d9cd55128 /src/map | |
| parent | 943017636ea3ca3b56ffa216bb8529e570bd5072 (diff) | |
| download | hercules-e96f41fafafff988ac27aed09f2459acc4ba78ff.tar.gz hercules-e96f41fafafff988ac27aed09f2459acc4ba78ff.tar.bz2 hercules-e96f41fafafff988ac27aed09f2459acc4ba78ff.tar.xz hercules-e96f41fafafff988ac27aed09f2459acc4ba78ff.zip | |
- Moved the OPTION defines from map.h to status.h (where they belong)
- Added back SC_XMAS to status.c (how was it... lost?)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6550 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/map.h | 19 | ||||
| -rw-r--r-- | src/map/status.c | 2 | ||||
| -rw-r--r-- | src/map/status.h | 19 |
3 files changed, 21 insertions, 19 deletions
diff --git a/src/map/map.h b/src/map/map.h index 44b29af42..18e159163 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -238,25 +238,6 @@ enum { #define DEFAULT_AUTOSAVE_INTERVAL 60*1000
-#define OPTION_SIGHT 0x0001
-#define OPTION_HIDE 0x0002
-#define OPTION_CLOAK 0x0004
-#define OPTION_CART1 0x0008
-#define OPTION_FALCON 0x0010
-#define OPTION_RIDING 0x0020
-#define OPTION_INVISIBLE 0x0040
-#define OPTION_CART2 0x0080
-#define OPTION_CART3 0x0100
-#define OPTION_CART4 0x0200
-#define OPTION_CART5 0x0400
-#define OPTION_ORCISH 0x0800
-#define OPTION_WEDDING 0x1000
-#define OPTION_RUWACH 0x2000
-#define OPTION_CHASEWALK 0x4000
-#define OPTION_FLYING 0x8000
-//TODO: Get these Missing options...
-#define OPTION_SIGHTTRASHER 0x0001
-
//Specifies maps where players may hit each other
#define map_flag_vs(m) (map[m].flag.pvp || map[m].flag.gvg_dungeon || map[m].flag.gvg || (agit_flag && map[m].flag.gvg_castle))
//Specifies maps that have special GvG/WoE restrictions
diff --git a/src/map/status.c b/src/map/status.c index 6afc10bb0..0fb0ba64b 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4130,6 +4130,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val break;
case SC_WEDDING: //結婚用(結婚衣裳になって?くのが?いとか)
+ case SC_XMAS:
{
struct view_data *vd = status_get_viewdata(bl);
if (vd) {
@@ -5016,6 +5017,7 @@ int status_change_end( struct block_list* bl , int type,int tid ) break;
case SC_WEDDING: //結婚用(結婚衣裳になって?くのが?いとか)
+ case SC_XMAS:
{
struct view_data *vd = status_get_viewdata(bl);
if (vd) {
diff --git a/src/map/status.h b/src/map/status.h index d4a7168ad..5caf42a79 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -441,6 +441,25 @@ enum { #define OPT3_AURASHIELD 0x800 //Assumptio
#define OPT3_HEAT 0x1000 //Warmth Skills
+#define OPTION_SIGHT 0x0001
+#define OPTION_HIDE 0x0002
+#define OPTION_CLOAK 0x0004
+#define OPTION_CART1 0x0008
+#define OPTION_FALCON 0x0010
+#define OPTION_RIDING 0x0020
+#define OPTION_INVISIBLE 0x0040
+#define OPTION_CART2 0x0080
+#define OPTION_CART3 0x0100
+#define OPTION_CART4 0x0200
+#define OPTION_CART5 0x0400
+#define OPTION_ORCISH 0x0800
+#define OPTION_WEDDING 0x1000
+#define OPTION_RUWACH 0x2000
+#define OPTION_CHASEWALK 0x4000
+#define OPTION_FLYING 0x8000
+//TODO: Get these Missing options...
+#define OPTION_SIGHTTRASHER 0x0001
+
// パラメータ所得系 battle.c より移動
int status_get_class(struct block_list *bl);
int status_get_lv(struct block_list *bl);
|